[CODE]:基础信息变更

ruoyi-warehouse/src/main/java/com/ruoyi/basicData/service/impl/TCorpsServiceImpl.java

@@ -96,16 +96,24 @@ public class TCorpsServiceImpl implements ITCorpsService {
         TCorps corps = JSONArray.parseObject(tCorps, TCorps.class);
         JSONArray jsonArray = JSONArray.parseArray(tCustomerContacts);
         List<TCustomerContact> customerContactList = JSONObject.parseArray(jsonArray.toJSONString(), TCustomerContact.class);
-        corps.setfStatus("0");
         if (StringUtils.isNull(corps.getfId())) {
             corps.setCreateBy(loginUser.getUser().getUserName());
             corps.setCreateTime(new Date());
+            corps.setfStatus("0");
             tCorpsMapper.insertTCorps(corps);
             fPid=corps.getfId();
         } else {
             fPid=corps.getfId();
             corps.setUpdateBy(loginUser.getUser().getUserName());
             corps.setUpdateTime(new Date());
+            if(corps.getfStatus().equals("1")){
+                TWarehouseBills tWarehouseBill =new TWarehouseBills();
+                tWarehouseBill.setfCorpid(corps.getfId());
+                List<TWarehouseBills>   tWarehouseBillList=tWarehouseBillsMapper.selectTWarehousebillsList(tWarehouseBill);
+                if(tWarehouseBillList!=null && !tWarehouseBillList.isEmpty()){
+                    return AjaxResult.error("客户在库存总账有记录不可变更状态");
+                }
+            }
             tCorpsMapper.updateTCorps(corps);
             tCustomerContactMapper.deleteCustomerContactByCorps(fPid);
         }

ruoyi-warehouse/src/main/java/com/ruoyi/basicData/service/impl/TFeesServiceImpl.java

@@ -73,12 +73,6 @@ public class TFeesServiceImpl implements ITFeesService {
      */
     @Override
     public AjaxResult updateTFees(TFees tFees) {
-        TWarehousebillsfees tWarehousebillsfees =new TWarehousebillsfees();
-        tWarehousebillsfees.setfFeeid(tFees.getfId());
-        List<TWarehousebillsfees> TWarehousebillsfeesList =tWarehousebillsfeesMapper.selectTWarehousebillsfeesList(tWarehousebillsfees);
-        if(TWarehousebillsfeesList!=null && !TWarehousebillsfeesList.isEmpty()){
-            return AjaxResult.error("费用在库存总账有记录不可变更状态");
-        }
         tFees.setUpdateTime(DateUtils.getNowDate());
         tFeesMapper.updateTFees(tFees);
         return AjaxResult.success();

ruoyi-warehouse/src/main/java/com/ruoyi/basicData/service/impl/TGoodsServiceImpl.java

@@ -73,11 +73,13 @@ public class TGoodsServiceImpl implements ITGoodsService {
      */
     @Override
     public AjaxResult updateTGoods(TGoods tGoods) {
-        TWarehousebillsitems tWarehousebillsitems =new TWarehousebillsitems();
-        tWarehousebillsitems.setfGoodsid(tGoods.getfId());
-        List<TWarehousebillsitems> warehousebillsitemsList1 =tWarehousebillsitemsMapper.selectTWarehousebillsitemsList(tWarehousebillsitems);
-        if(warehousebillsitemsList1!=null && !warehousebillsitemsList1.isEmpty()){
-            return AjaxResult.error("商品在库存总账有记录不可变更状态");
+        if(tGoods.getfStatus()!=null && tGoods.getfStatus().equals("1")){
+            TWarehousebillsitems tWarehousebillsitems =new TWarehousebillsitems();
+            tWarehousebillsitems.setfGoodsid(tGoods.getfId());
+            List<TWarehousebillsitems> warehousebillsitemsList1 =tWarehousebillsitemsMapper.selectTWarehousebillsitemsList(tWarehousebillsitems);
+            if(warehousebillsitemsList1!=null && !warehousebillsitemsList1.isEmpty()){
+                return AjaxResult.error("商品在库存总账有记录不可变更状态");
+            }
         }
         tGoods.setUpdateTime(DateUtils.getNowDate());
         tGoodsMapper.updateTGoods(tGoods);

ruoyi-warehouse/src/main/java/com/ruoyi/basicData/service/impl/TWarehouseServiceImpl.java

@@ -104,16 +104,24 @@ public class TWarehouseServiceImpl implements ITWarehouseService {
         TWarehouse tWarehouses = JSONArray.parseObject(tWarehouse, TWarehouse.class);
         JSONArray jsonArray = JSONArray.parseArray(tWarehouseArea);
         List<TWarehouseArea> tWarehouseAreaList = JSONObject.parseArray(jsonArray.toJSONString(), TWarehouseArea.class);
-        tWarehouses.setfStatus("0");
         if (StringUtils.isNull(tWarehouses.getfId())) {
             tWarehouses.setCreateBy(loginUser.getUser().getUserName());
             tWarehouses.setCreateTime(new Date());
+            tWarehouses.setfStatus("0");
             tWarehouseMapper.insertTWarehouse(tWarehouses);
             fPid=tWarehouses.getfId();
         } else {
             fPid=tWarehouses.getfId();
             tWarehouses.setUpdateBy(loginUser.getUser().getUserName());
             tWarehouses.setUpdateTime(new Date());
+            if(tWarehouses.getfStatus()!=null && tWarehouses.getfStatus().equals("1") ){
+                TWarehouseBills   tWarehouseBill =new TWarehouseBills();
+                tWarehouseBill.setfWarehouseid(tWarehouses.getfId());
+                List<TWarehouseBills>   tWarehouseBillList=tWarehouseBillsMapper.selectTWarehousebillsList(tWarehouseBill);
+                if(tWarehouseBillList!=null && !tWarehouseBillList.isEmpty()){
+                    return AjaxResult.error("仓库在库存总账有记录不可变更状态");
+                }
+            }
             tWarehouseMapper.updateTWarehouse(tWarehouses);
             tWarehouseAreaMapper.deleteTWarehouseAreaByTWarehoused(fPid);
         }
@@ -135,11 +143,13 @@ public class TWarehouseServiceImpl implements ITWarehouseService {
      */
     @Override
     public AjaxResult updateTWarehouse(TWarehouse tWarehouse) {
-        TWarehouseBills   tWarehouseBill =new TWarehouseBills();
-        tWarehouseBill.setfWarehouseid(tWarehouse.getfId());
-        List<TWarehouseBills>   tWarehouseBillList=tWarehouseBillsMapper.selectTWarehousebillsList(tWarehouseBill);
-        if(tWarehouseBillList!=null && !tWarehouseBillList.isEmpty()){
-            return AjaxResult.error("仓库在库存总账有记录不可变更状态");
+        if(tWarehouse.getfStatus()!=null && tWarehouse.getfStatus().equals("1") ){
+            TWarehouseBills   tWarehouseBill =new TWarehouseBills();
+            tWarehouseBill.setfWarehouseid(tWarehouse.getfId());
+            List<TWarehouseBills>   tWarehouseBillList=tWarehouseBillsMapper.selectTWarehousebillsList(tWarehouseBill);
+            if(tWarehouseBillList!=null && !tWarehouseBillList.isEmpty()){
+                return AjaxResult.error("仓库在库存总账有记录不可变更状态");
+            }
         }
         tWarehouse.setUpdateTime(DateUtils.getNowDate());
         tWarehouseMapper.updateTWarehouse(tWarehouse);