dongke 1 год назад
Родитель
Сommit
5e8a16b26d

+ 1 - 1
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);
 
         // 附件

+ 2 - 2
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);