Merge remote-tracking branch 'origin/dev' into dev

ruoyi-admin/src/main/java/com/ruoyi/web/controller/shipping/controller/TWarehousebillsCntritemsController.java

@@ -93,7 +93,7 @@ public class TWarehousebillsCntritemsController extends BaseController
     /**
      * 删除凯和箱明细
      */
-    @PreAuthorize("@ss.hasPermi('shipping:cntritems:remove')")
+    //@PreAuthorize("@ss.hasPermi('shipping:cntritems:remove')")
     @Log(title = "凯和箱明细", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{fIds}")
     public AjaxResult remove(@PathVariable Long[] fIds)

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)) {
@@ -4967,6 +4971,8 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return AjaxResult.error("更新主表信息出错!");
         }
+        //删除箱信息
+        tWarehousebillsCntritemsMapper.deleteTWarehousebillsCntritemsfPid(warehouseBills.getfId());
         //修改货物信息
         if (StringUtils.isNotEmpty(tWarehousebillsCntr) && !"[]".equals(tWarehousebillsCntr)){
             tWarehousebillsCntrMapper.deleteTWarehousebillsCntrfPid(warehouseBills.getfId());
@@ -4991,7 +4997,6 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         }
         //修改箱信息
         if (StringUtils.isNotEmpty(tWarehousebillsCntritems) && !"[]".equals(tWarehousebillsCntritems)){
-            tWarehousebillsCntritemsMapper.deleteTWarehousebillsCntritemsfPid(warehouseBills.getfId());
             JSONArray objects = JSONArray.parseArray(tWarehousebillsCntritems);
             List<TWarehousebillsCntritems> tWarehousebillsCntritemsList = JSONObject.parseArray(objects.toJSONString(), TWarehousebillsCntritems.class);
             for (TWarehousebillsCntritems warehousebillsCntritems : tWarehousebillsCntritemsList) {