Browse Source

[CODE]: 库存明细添加单据类型、出库状态40

maxianghua 4 years ago
parent
commit
d1322f5d19

+ 6 - 3
ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/impl/TWarehouseBillsServiceImpl.java

@@ -392,6 +392,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             for (TWarehousebillsitems wbItem : warehousebillsitemsList) {
                 // 仓储计费日期
                 wbItem.setfChargedate(warehouseBills.getfChargedate());
+                wbItem.setfBilltype(billsType);
                 if(null!=wbItem.getfId()){
                     wbItem.setUpdateBy(loginUser.getUser().getUserName());
                     wbItem.setUpdateTime(new Date());
@@ -655,13 +656,15 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             i++;
             int num = 0;
             if (StringUtils.isNotNull(wbItem.getfId())) {
-                wbItem.setfBillstatus("90");
+                wbItem.setfBillstatus("40");
                 wbItem.setfBsdate(tWarehouseBills.getfBsdate());
                 wbItem.setUpdateBy(loginUser.getUser().getUserName());
                 wbItem.setUpdateTime(new Date());
                 num = tWarehousebillsitemsMapper.updateTWarehousebillsitems(wbItem);
-                // 添加状态log
-                insertTWarehousebillsLog(wbItem,90l,loginUser);
+                if("SJCK".equals(billsType)){
+                    // 添加状态log
+                    insertTWarehousebillsLog(wbItem,40l,loginUser);
+                }
             }
             if (num <= 0) {
                 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();