凯和修改

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

@@ -952,13 +952,17 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         JSONArray jsonCrArray = JSONArray.parseArray(tWarehousebillsCntritems);
         List<TWarehousebillsCntritems> tWarehousebillsCntrs = JSONObject.parseArray(jsonCrArray.toJSONString(), TWarehousebillsCntritems.class);
         TWarehouseBills tWarehouseBills = tWarehouseBillsMapper.selectTWarehousebillsById(warehouseBills.getfId());
-        if (tWarehouseBills.getfBillstatus() == 7L
+        /*if (tWarehouseBills.getfBillstatus() == 7L
                 || tWarehouseBills.getfBillstatus() == 6L) {
         } else {
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return AjaxResult.error("当前数据不允许暂存");
+        }*/
+        if (tWarehouseBills.getfBillstatus() != null && tWarehouseBills.getfBillstatus().longValue() == 6){
+            warehouseBills.setfBillstatus(7L);
+        }else {
+            warehouseBills.setfBillstatus(tWarehouseBills.getfBillstatus());
         }
-        warehouseBills.setfBillstatus(7L);
         int i = tWarehouseBillsMapper.updateTWarehousebills(warehouseBills);
         int cntritemsfPid = tWarehousebillsCntritemsMapper.deleteTWarehousebillsCntritemsfPid(warehouseBills.getfId());
         if (CollectionUtils.isNotEmpty(tWarehousebillsCntrs)) {