Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss-server-mdm

src/main/java/com/dk/mdm/service/common/CommonService.java

@@ -18,6 +18,7 @@ import org.postgresql.util.PGobject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.text.SimpleDateFormat;
 import java.time.LocalDate;
 import java.util.*;
 
@@ -1139,7 +1140,13 @@ public class CommonService extends BaseService<Map<String, Object>> {
      */
     public ResponseResultVO<Map<String, Object>> getCurrentDate(Map<String, Object> param) {
         Map<String, Object> res = new HashMap<>();
-        res.put("currentDate", LocalDate.now());
+        if(param.isEmpty()) {
+            res.put("currentDate", LocalDate.now());
+        }else {
+            Date date = new Date();
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat ("yyyy-MM-dd hh:mm:ss");
+            res.put("currentDate", simpleDateFormat.format(date));
+        }
         return ResponseResultUtil.success(res);
     }
 }

src/main/java/com/dk/mdm/service/ivt/outbound/OutboundService.java

@@ -114,7 +114,7 @@ public class OutboundService extends BaseService<Outbound> {
 
         OutboundResponse outboundResponse = outboundMapper.selectById(id);
         // 商品明细
-        List<OutboundItemResponse> outboundItem = outboundItemMapper.selectByCond(new OutboundItemQuery().setOutId(id));
+        List<OutboundItemResponse> outboundItem = outboundItemMapper.selectByCond(new OutboundItemQuery().setOutId(id).setFlgValid(true));
         outboundResponse.setGoodsList(outboundItem);
 
         // 附件

src/main/java/com/dk/mdm/service/mac/ReceiptService.java

@@ -817,7 +817,7 @@ public class ReceiptService extends BaseService<RecPay> {
                 // 插入资金流水
                 MoneyAccountItem moneyAccountItem = new MoneyAccountItem();
                 moneyAccountItem.setMacId(recPayItem.getMacId()).setFlowType(Constant.FlowType.SHOU_FU_KUAN.getName())
-                        .setInvoiceId(recPayItem.getItemId()).setAmtInflow(recPayItem.getAmtPay()).setAccDate(recPayVO.getAccDate())
+                        .setInvoiceId(recPayItem.getItemId()).setAmtInflow(recPayItem.getAmtPay().negate()).setAccDate(recPayVO.getAccDate())
                         .setMakeStaff(recPayItem.getMakeStaff()).setCpId(recPayItem.getCpId());
                 moneyAccountItemMapper.insert(moneyAccountItem);
 
@@ -887,7 +887,7 @@ public class ReceiptService extends BaseService<RecPay> {
                 // 插入资金流水
                 MoneyAccountItem moneyAccountItem = new MoneyAccountItem();
                 moneyAccountItem.setMacId(recPayItem.getMacId()).setFlowType(Constant.FlowType.SHOU_FU_KUAN.getName())
-                        .setInvoiceId(recPayItem.getItemId()).setAmtInflow(recPayItem.getAmtPay()).setAccDate(recPayVO.getAccDate())
+                        .setInvoiceId(recPayItem.getItemId()).setAmtInflow(recPayItem.getAmtPay().negate()).setAccDate(recPayVO.getAccDate())
                         .setMakeStaff(recPayItem.getMakeStaff()).setCpId(recPayItem.getCpId());
                 moneyAccountItemMapper.insert(moneyAccountItem);