Просмотр исходного кода

1、修改销售退货、销售出库编辑的记账判断

zhoux 1 год назад
Родитель
Сommit
a5ff97d1e3

+ 2 - 6
src/main/java/com/dk/mdm/service/ivt/outbound/OutboundSaleOrderService.java

@@ -714,9 +714,7 @@ public class OutboundSaleOrderService extends BaseService<Outbound> {
             //region  已出库编辑
             if (Constant.OutStatus.YICHUKU.getName().equals(outboundVO.getOutStatus())) {
                 //region 应收反记账
-                if (outboundVO.getReceivableId() != null) {
-                    accountService.reverseReceivable(outboundVO.getOutId(), Constant.InventoryDocCode.OUTBOUND.getTableName());
-                }
+                accountService.reverseReceivable(outboundVO.getOutId(), Constant.InventoryDocCode.OUTBOUND.getTableName());
                 //endregion
 
                 //region 修改明细
@@ -882,9 +880,7 @@ public class OutboundSaleOrderService extends BaseService<Outbound> {
                 //endregion
 
                 //region  应收记账
-                if (outboundVO.getReceivableId() != null) {
-                    accountService.accReceivable(outboundResponse.getOutId(), Constant.InventoryDocCode.OUTBOUND.getTableName());
-                }
+                accountService.accReceivable(outboundResponse.getOutId(), Constant.InventoryDocCode.OUTBOUND.getTableName());
                 //endregion
 
                 //region 外协品新建外协入库单

+ 6 - 6
src/main/java/com/dk/mdm/service/ivt/outbound/OutboundSaleReturnService.java

@@ -590,9 +590,9 @@ public class OutboundSaleReturnService extends BaseService<Outbound> {
             if (Constant.OutStatus.YICHUKU.getName().equals(outboundVO.getOutStatus())) {
 
                 //region 退账
-                if (outboundVO.getReceivableId() != null) {
-                    accountService.reverseReceivable(outboundVO.getOutId(), Constant.InventoryDocCode.OUTBOUND.getTableName());
-                }
+//                if (outboundVO.getReceivableId() != null) {
+                accountService.reverseReceivable(outboundVO.getOutId(), Constant.InventoryDocCode.OUTBOUND.getTableName());
+//                }
                 //endregion
 
                 //region  反写出库总单和明细 反写订单总单和明细
@@ -715,9 +715,9 @@ public class OutboundSaleReturnService extends BaseService<Outbound> {
                 //endregion
 
                 //region  入账
-                if (outboundVO.getReceivableId() != null) {
-                    accountService.accReceivable(outboundVO.getOutId(), Constant.InventoryDocCode.OUTBOUND.getTableName());
-                }
+//                if (outboundVO.getReceivableId() != null) {
+                accountService.accReceivable(outboundVO.getOutId(), Constant.InventoryDocCode.OUTBOUND.getTableName());
+//                }
                 //endregion
 
                 //region 修改库存