基础数据验证修改

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labelBarbasic/BarbasicController.java

@@ -31,7 +31,7 @@ import com.win.module.wms.convert.labelBarbasic.BarbasicConvert;
 import com.win.module.wms.service.labelBarbasic.BarbasicService;
 
 
-@Tag(name = "管理后台 - 条码实体基类")
+@Tag(name = "管理后台 - 采购件标签/制造件标签/器具标签/库位标签/叫料标签")
 @RestController
 @RequestMapping("/wms/barbasic")
 @Validated

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/accountcalendar/AccountcalendarServiceImpl.java

@@ -56,6 +56,7 @@ public class AccountcalendarServiceImpl implements AccountcalendarService {
     @Override
     public void updateAccountcalendar(AccountcalendarUpdateReqVO updateReqVO) {
         // 校验存在
+        validateAccountcalendarExists(updateReqVO.getId());
         validateAccountcalendarForCreateOrUpdate(updateReqVO.getId(),updateReqVO.getAvailable());
         // 更新
         AccountcalendarDO updateObj = AccountcalendarConvert.INSTANCE.convert(updateReqVO);
@@ -161,16 +162,12 @@ public class AccountcalendarServiceImpl implements AccountcalendarService {
     private void validateAccountcalendarForCreateOrUpdate(Long id,String available) {
         // 关闭数据权限，避免因为没有数据权限，查询不到数据，进而导致唯一校验不正确
         DataPermissionUtils.executeIgnore(() -> {
-            validateAccountcalendarExists(id);
             //校验是否可用为空
             validateAvailableExists(available);
         });
     }
     @VisibleForTesting
     private void validateAccountcalendarExists(Long id) {
-        if (id == null) {
-            return;
-        }
         AccountcalendarDO accountcalendar = accountcalendarMapper.selectById(id);
         if (accountcalendar == null) {
             throw exception(ACCOUNTCALENDAR_NOT_EXISTS);

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/areabasic/AreabasicServiceImpl.java

@@ -60,6 +60,7 @@ public class AreabasicServiceImpl implements AreabasicService {
     @Override
     public void updateAreabasic(AreabasicUpdateReqVO updateReqVO) {
         // 校验存在
+        validateAreabasicExists(updateReqVO.getId());
         validateAreabasicForCreateOrUpdate(updateReqVO.getId(),updateReqVO.getCode(),updateReqVO.getWarehouseCode(),updateReqVO.getIsFunctional(),updateReqVO.getAvailable());
         // 更新
         AreabasicDO updateObj = AreabasicConvert.INSTANCE.convert(updateReqVO);
@@ -197,16 +198,15 @@ public class AreabasicServiceImpl implements AreabasicService {
     private void validateAreabasicForCreateOrUpdate(Long id,String code,String warehouseCode,String isFunctional,String available) {
         // 关闭数据权限，避免因为没有数据权限，查询不到数据，进而导致唯一校验不正确
         DataPermissionUtils.executeIgnore(() -> {
-            validateAreabasicExists(id);
             // 校验code唯一
             validateCodeExists(code);
+            validateWarehouseCodeExists(warehouseCode);
+            validateIsFunctionalExists(isFunctional);
+            validateAvailableExists(available);
         });
     }
     @VisibleForTesting
     private void validateAreabasicExists(Long id) {
-        if (id == null) {
-            return;
-        }
         AreabasicDO areabasic = areabasicMapper.selectById(id);
         if (areabasic == null) {
             throw exception(AREABASIC_NOT_EXISTS);
@@ -214,13 +214,13 @@ public class AreabasicServiceImpl implements AreabasicService {
     }
     @VisibleForTesting
     private void validateCodeExists(String code) {
-        if (code.isEmpty()) {
+        if (code == null) {
             throw exception(AREABASIC_CODE_NOT_EXISTS);
         }
     }
     @VisibleForTesting
     private void validateWarehouseCodeExists(String warehouseCode) {
-        if (warehouseCode.isEmpty()) {
+        if (warehouseCode == null) {
             throw exception(AREABASIC_WAREHOUSE_CODE_EXISTS);
         }else {
             WarehouseDO warehouseDO = warehouseMapper.selectByCode(warehouseCode);
@@ -231,13 +231,13 @@ public class AreabasicServiceImpl implements AreabasicService {
     }
     @VisibleForTesting
     private void validateIsFunctionalExists(String isFunctional) {
-        if (isFunctional.isEmpty()) {
+        if (isFunctional == null) {
             throw exception(AREABASIC_IS_FUNCTIONAL_EXISTS);
         }
     }
     @VisibleForTesting
     private void validateAvailableExists(String available) {
-        if (available.isEmpty()) {
+        if (available == null) {
             throw exception(AREABASIC_AVAIABLE_NOT_EXISTS);
         }
     }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/carrier/CarrierServiceImpl.java

@@ -51,8 +51,8 @@ public class CarrierServiceImpl implements CarrierService {
     @Override
     public void updateCarrier(CarrierUpdateReqVO updateReqVO) {
         // 校验存在
+        validateCarrierExists(updateReqVO.getId());
         validateCarrierForCreateOrUpdate(updateReqVO.getCode(), updateReqVO.getShortName(), updateReqVO.getAvailable());
-
         // 更新
         CarrierDO updateObj = CarrierConvert.INSTANCE.convert(updateReqVO);
         carrierMapper.updateById(updateObj);
@@ -152,9 +152,6 @@ public class CarrierServiceImpl implements CarrierService {
 
     @VisibleForTesting
     private void validateCarrierExists(Long id) {
-        if (id == null) {
-            return;
-        }
         CarrierDO carrier = carrierMapper.selectById(id);
         if (carrier == null) {
             throw exception(CARRIER_NOT_EXISTS);

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/currencyexchange/CurrencyexchangeServiceImpl.java

@@ -42,7 +42,7 @@ public class CurrencyexchangeServiceImpl implements CurrencyexchangeService {
 
     @Override
     public Long createCurrencyexchange(CurrencyexchangeCreateReqVO createReqVO) {
-        validateCurrencyexchangeForCreateOrUpdate(createReqVO.getId(),createReqVO.getCurrency(),createReqVO.getBasiccurrency(),createReqVO.getRate(),createReqVO.getAvailable());
+        validateCurrencyexchangeForCreateOrUpdate(createReqVO.getCurrency(),createReqVO.getBasiccurrency(),createReqVO.getRate(),createReqVO.getAvailable());
 
         // 插入
         CurrencyexchangeDO currencyexchange = CurrencyexchangeConvert.INSTANCE.convert(createReqVO);
@@ -53,9 +53,9 @@ public class CurrencyexchangeServiceImpl implements CurrencyexchangeService {
 
     @Override
     public void updateCurrencyexchange(CurrencyexchangeUpdateReqVO updateReqVO) {
-        validateCurrencyexchangeForCreateOrUpdate(null,updateReqVO.getCurrency(),updateReqVO.getBasiccurrency(),updateReqVO.getRate(),updateReqVO.getAvailable());
         // 校验存在
         validateCurrencyexchangeExists(updateReqVO.getId());
+        validateCurrencyexchangeForCreateOrUpdate(updateReqVO.getCurrency(),updateReqVO.getBasiccurrency(),updateReqVO.getRate(),updateReqVO.getAvailable());
         // 更新
         CurrencyexchangeDO updateObj = CurrencyexchangeConvert.INSTANCE.convert(updateReqVO);
         currencyexchangeMapper.updateById(updateObj);
@@ -175,11 +175,10 @@ public class CurrencyexchangeServiceImpl implements CurrencyexchangeService {
         return errorList;
     }
 
-    private void validateCurrencyexchangeForCreateOrUpdate(Long id, String currency, String basiccurrency,
+    private void validateCurrencyexchangeForCreateOrUpdate(String currency, String basiccurrency,
                                                            BigDecimal rate, String available) {
         // 关闭数据权限，避免因为没有数据权限，查询不到数据，进而导致唯一校验不正确
         DataPermissionUtils.executeIgnore(() -> {
-            validateConfigurationSettingExists(id);
             // 校验code唯一
             validateCurrencyExists(currency);
             validateBasiccurrencyExists(basiccurrency);

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customer/CustomerServiceImpl.java

@@ -53,6 +53,7 @@ public class CustomerServiceImpl implements CustomerService {
 
     @Override
     public void updateCustomer(CustomerUpdateReqVO updateReqVO) {
+        validateCustomerExists(updateReqVO.getId());
         // 校验存在
         validateCurrencyexchangeForCreateOrUpdate(updateReqVO.getId(),updateReqVO.getCode(),updateReqVO.getName(), updateReqVO.getShortName(),updateReqVO.getAvailable());
         CustomerDO customerDO = customerMapper.selectOne("name", updateReqVO.getName(), "id", updateReqVO.getId());
@@ -166,7 +167,6 @@ public class CustomerServiceImpl implements CustomerService {
     private void validateCurrencyexchangeForCreateOrUpdate(Long id, String code, String name, String shortName, String available) {
         // 关闭数据权限，避免因为没有数据权限，查询不到数据，进而导致唯一校验不正确
         DataPermissionUtils.executeIgnore(() -> {
-            validateCustomerExists(id);
             validateCodeExists(code);
             validateNameExists(name,id);
             // 校验code唯一
@@ -176,9 +176,6 @@ public class CustomerServiceImpl implements CustomerService {
     }
     @VisibleForTesting
     private void validateCustomerExists(Long id) {
-        if (id == null) {
-            return;
-        }
         CustomerDO customer = customerMapper.selectById(id);
         if (customer == null) {
             throw exception(CUSTOMER_NOT_EXISTS);

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerdock/CustomerdockServiceImpl.java

@@ -52,9 +52,9 @@ public class CustomerdockServiceImpl implements CustomerdockService {
 
     @Override
     public void updateCustomerdock(CustomerdockUpdateReqVO updateReqVO) {
+        validateCustomerExists(updateReqVO.getId());
         // 校验存在
         validateCurrencyexchangeForCreateOrUpdate(updateReqVO.getId(),updateReqVO.getCode(),updateReqVO.getCustomerCode(),updateReqVO.getDefaultLocationCode(),updateReqVO.getAvailable());
-
         // 更新
         CustomerdockDO updateObj = CustomerdockConvert.INSTANCE.convert(updateReqVO);
         customerdockMapper.updateById(updateObj);
@@ -69,7 +69,8 @@ public class CustomerdockServiceImpl implements CustomerdockService {
     }
 
     private void validateCustomerdockExists(Long id) {
-        if (customerdockMapper.selectById(id) == null) {
+        CustomerdockDO customerdockDO = customerdockMapper.selectById(id);
+        if (customerdockDO == null) {
             throw exception(CUSTOMERDOCK_NOT_EXISTS);
         }
     }
@@ -170,7 +171,6 @@ public class CustomerdockServiceImpl implements CustomerdockService {
     private void validateCurrencyexchangeForCreateOrUpdate(Long id, String code, String customerCode,String defaultLocationCode, String available) {
         // 关闭数据权限，避免因为没有数据权限，查询不到数据，进而导致唯一校验不正确
         DataPermissionUtils.executeIgnore(() -> {
-            validateCustomerExists(id);
             validateCodeExists(id,code);
             // 校验code唯一
             validateCustomerCodeExists(customerCode);

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customeritem/CustomeritemServiceImpl.java

@@ -62,7 +62,8 @@ public class CustomeritemServiceImpl implements CustomeritemService {
     }
 
     private void validateCustomeritemExists(Long id) {
-        if (customeritemMapper.selectById(id) == null) {
+        CustomeritemDO customeritemDO = customeritemMapper.selectById(id);
+        if (customeritemDO == null) {
             throw exception(CUSTOMERITEM_NOT_EXISTS);
         }
     }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/dock/DockServiceImpl.java

@@ -48,7 +48,7 @@ public class DockServiceImpl implements DockService {
 
     @Override
     public Long createDock(DockCreateReqVO createReqVO) {
-        validateDockForCreateOrUpdate(createReqVO.getId(), createReqVO.getCode(), createReqVO.getType(), createReqVO.getWarehouseCode(), createReqVO.getDefaultLocationCode(), createReqVO.getAvailable());
+        validateDockForCreateOrUpdate(createReqVO.getCode(), createReqVO.getType(), createReqVO.getWarehouseCode(), createReqVO.getDefaultLocationCode(), createReqVO.getAvailable());
 
         // 插入
         DockDO dock = DockConvert.INSTANCE.convert(createReqVO);
@@ -59,8 +59,9 @@ public class DockServiceImpl implements DockService {
 
     @Override
     public void updateDock(DockUpdateReqVO updateReqVO) {
+        validateDockExists(updateReqVO.getId());
         // 校验存在
-        validateDockForCreateOrUpdate(updateReqVO.getId(), updateReqVO.getCode(), updateReqVO.getType(), updateReqVO.getWarehouseCode(), updateReqVO.getDefaultLocationCode(), updateReqVO.getAvailable());
+        validateDockForCreateOrUpdate( updateReqVO.getCode(), updateReqVO.getType(), updateReqVO.getWarehouseCode(), updateReqVO.getDefaultLocationCode(), updateReqVO.getAvailable());
         // 更新
         DockDO updateObj = DockConvert.INSTANCE.convert(updateReqVO);
         dockMapper.updateById(updateObj);
@@ -102,12 +103,7 @@ public class DockServiceImpl implements DockService {
     public String valitedock(DockDO dock) {
         StringBuilder message = new StringBuilder();
         try {
-            validateDockExists(null);
-        } catch (ServiceException ex) {
-            message.append(ex.getMessage()).append(",");
-        }
-        try {
-            validateCodeExists(null, dock.getCode());
+            validateCodeExists( dock.getCode());
         } catch (ServiceException ex) {
             message.append(ex.getMessage()).append(",");
         }
@@ -167,12 +163,11 @@ public class DockServiceImpl implements DockService {
     }
 
 
-    private void validateDockForCreateOrUpdate(Long id, String code, String type, String warehouseCode,
+    private void validateDockForCreateOrUpdate(String code, String type, String warehouseCode,
                                                String defaultLocationCode, String available) {
         // 关闭数据权限，避免因为没有数据权限，查询不到数据，进而导致唯一校验不正确
         DataPermissionUtils.executeIgnore(() -> {
-            validateDockExists(id);
-            validateCodeExists(id, code);
+            validateCodeExists(code);
             // 校验code唯一
             validateTypeExists(type);
             validateWareHouseCodeExists(warehouseCode);
@@ -193,7 +188,7 @@ public class DockServiceImpl implements DockService {
     }
 
     @VisibleForTesting
-    private void validateCodeExists(Long id, String code) {
+    private void validateCodeExists( String code) {
         if (code == null) {
             throw exception(DOCK_CODE_NOT_EXISTS);
         }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itemwarehouse/ItemwarehouseServiceImpl.java

@@ -171,6 +171,7 @@ public class ItemwarehouseServiceImpl implements ItemwarehouseService {
         });
         return errorList;
     }
+
     private void validateItemWarehouseForCreateOrUpdate(String code, String manageMode, String warehouse, String packUnit, String available) {
         // 关闭数据权限，避免因为没有数据权限，查询不到数据，进而导致唯一校验不正确
         DataPermissionUtils.executeIgnore(() -> {

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/locationgroup/LocationgroupServiceImpl.java

@@ -62,6 +62,7 @@ public class LocationgroupServiceImpl implements LocationgroupService {
     @Override
     public void updateLocationgroup(LocationgroupUpdateReqVO updateReqVO) {
         // 校验存在
+        validateLocationgroupExists(updateReqVO.getId());
         validateLocationForCreateOrUpdate(updateReqVO.getCode(), updateReqVO.getWarehouseCode(), updateReqVO.getAreaCode(), updateReqVO.getAvailable());
         // 更新
         LocationgroupDO updateObj = LocationgroupConvert.INSTANCE.convert(updateReqVO);
@@ -180,9 +181,6 @@ public class LocationgroupServiceImpl implements LocationgroupService {
     }
 
     private void validateLocationgroupExists(Long id) {
-        if (id == null) {
-            return;
-        }
         if (locationgroupMapper.selectById(id) == null) {
             throw exception(LOCATIONGROUP_NOT_EXISTS);
         }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/owner/OwnerServiceImpl.java

@@ -55,6 +55,7 @@ public class OwnerServiceImpl implements OwnerService {
     @Override
     public void updateOwner(OwnerUpdateReqVO updateReqVO) {
         // 校验存在
+        validateOwnerExists(updateReqVO.getId());
         validateLocationForCreateOrUpdate(updateReqVO.getId(),updateReqVO.getCode(),updateReqVO.getShortName(),updateReqVO.getAvailable());
         // 更新
         OwnerDO updateObj = OwnerConvert.INSTANCE.convert(updateReqVO);
@@ -149,7 +150,6 @@ public class OwnerServiceImpl implements OwnerService {
     private void validateLocationForCreateOrUpdate(Long id, String code,String shortName,String available) {
         // 关闭数据权限，避免因为没有数据权限，查询不到数据，进而导致唯一校验不正确
         DataPermissionUtils.executeIgnore(() -> {
-            validateOwnerExists(id);
             validateCodeExists(code);
             // 校验code唯一
             validateShortNameExists(shortName);

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/process/ProcessServiceImpl.java

@@ -56,7 +56,8 @@ public class ProcessServiceImpl implements ProcessService {
     @Override
     public void updateProcess(ProcessUpdateReqVO updateReqVO) {
         // 校验存在
-        validateProcessForUpdate(updateReqVO.getId(),updateReqVO.getCode(),updateReqVO.getWorkshopCode(), updateReqVO.getProductionLineCode(),updateReqVO.getAvailable());
+        validateProcessExists(updateReqVO.getId());
+        validateProcessForUpdate(updateReqVO.getCode(),updateReqVO.getWorkshopCode(), updateReqVO.getProductionLineCode(),updateReqVO.getAvailable());
         // 更新
         ProcessDO updateObj = ProcessConvert.INSTANCE.convert(updateReqVO);
         processMapper.updateById(updateObj);
@@ -152,10 +153,9 @@ public class ProcessServiceImpl implements ProcessService {
         });
     }
 
-    private void validateProcessForUpdate(Long id, String code,String workshopCode,String productionLineCode,String available) {
+    private void validateProcessForUpdate(String code,String workshopCode,String productionLineCode,String available) {
         // 关闭数据权限，避免因为没有数据权限，查询不到数据，进而导致唯一校验不正确
         DataPermissionUtils.executeIgnore(() -> {
-            validateProcessExists(id);
             validateCodeExists(code);
             validateWorkShopeCodeExists(workshopCode);
             validateProductionLineCodeExists(productionLineCode);

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/project/ProjectServiceImpl.java

@@ -59,6 +59,7 @@ public class ProjectServiceImpl implements ProjectService {
     }
     @Override
     public void updateProject(ProjectUpdateReqVO updateReqVO) {
+        validateProjectExists(updateReqVO.getId());
         // 校验存在
         validateProjectForCreateOrUpdate(updateReqVO.getCode(),updateReqVO.getCustomerCode(),updateReqVO.getAvailable());
         // 更新
@@ -155,10 +156,8 @@ public class ProjectServiceImpl implements ProjectService {
         });
     }
     private void validateProjectExists(Long id) {
-        if (id == null) {
-            return;
-        }
-        if (projectMapper.selectById(id) == null) {
+        ProjectDO projectDO = projectMapper.selectById(id);
+        if (projectDO == null) {
             throw exception(PROJECT_NOT_EXISTS);
         }
     }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchaseprice/PurchasepriceServiceImpl.java

@@ -63,6 +63,7 @@ public class PurchasepriceServiceImpl implements PurchasepriceService {
     @Override
     public void updatePurchaseprice(PurchasepriceUpdateReqVO updateReqVO) {
         // 校验存在
+        validatePurchasepriceExists(updateReqVO.getId());
         validatePurchasepriceForCreateOrUpdate(updateReqVO.getSupplierCode(), updateReqVO.getItemCode()
                 , updateReqVO.getCurrency(), updateReqVO.getPrice(), updateReqVO.getAvailable());
         // 更新
@@ -180,10 +181,8 @@ public class PurchasepriceServiceImpl implements PurchasepriceService {
     }
 
     private void validatePurchasepriceExists(Long id) {
-        if (id == null) {
-            return;
-        }
-        if (purchasepriceMapper.selectById(id) == null) {
+        PurchasepriceDO purchasepriceDO = purchasepriceMapper.selectById(id);
+        if (purchasepriceDO == null) {
             throw exception(PURCHASEPRICE_NOT_EXISTS);
         }
     }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/saleprice/SalepriceServiceImpl.java

@@ -176,7 +176,6 @@ public class SalepriceServiceImpl implements SalepriceService {
     private void validateSalepriceForCreateOrUpdate(Long id, String customercode, String itemcode, String currency, BigDecimal price, String available) {
         // 关闭数据权限，避免因为没有数据权限，查询不到数据，进而导致唯一校验不正确
         DataPermissionUtils.executeIgnore(() -> {
-            validateSalepriceExists(id);
             // 校验code唯一
             validateCustomerCodeExists(customercode);
             validateCodeExists(itemcode,customercode);
@@ -189,10 +188,8 @@ public class SalepriceServiceImpl implements SalepriceService {
 
     @VisibleForTesting
     private void validateSalepriceExists(Long id) {
-        if (id == null) {
-            return;
-        }
-        if (salepriceMapper.selectById(id) == null) {
+        SalepriceDO salepriceDO = salepriceMapper.selectById(id);
+        if (salepriceDO == null) {
             throw exception(SALEPRICE_NOT_EXISTS);
         }
     }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/shift/ShiftServiceImpl.java

@@ -53,6 +53,7 @@ public class ShiftServiceImpl implements ShiftService {
     @Override
     public void updateShift(ShiftUpdateReqVO updateReqVO) {
         // 校验存在
+        validateShiftExists(updateReqVO.getId());
         validateShiftForCreateOrUpdate(updateReqVO.getId(),updateReqVO.getCode(),updateReqVO.getBeginTime(),updateReqVO.getEntTime(),updateReqVO.getEndAtNextDay(),
                 updateReqVO.getAvailable());
         // 更新
@@ -175,7 +176,6 @@ public class ShiftServiceImpl implements ShiftService {
                                                 String available) {
         // 关闭数据权限，避免因为没有数据权限，查询不到数据，进而导致唯一校验不正确
         DataPermissionUtils.executeIgnore(() -> {
-            validateShiftExists(id);
             // 校验code唯一
             validateCodeExists(code);
             validateBeginTimeExists(begintime);

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplier/SupplierServiceImpl.java

@@ -51,6 +51,7 @@ public class SupplierServiceImpl implements SupplierService {
 
     @Override
     public void updateSupplier(SupplierUpdateReqVO updateReqVO) {
+        validateSupplierExists(updateReqVO.getId());
         // 校验存在
         //validateSupplierForCreateOrUpdate(updateReqVO.getId(), updateReqVO.getCode(), updateReqVO.getShortName(), updateReqVO.getAvailable());
         SupplierDO supplierDO = supplierMapper.selectById(updateReqVO.getId());
@@ -155,7 +156,6 @@ public class SupplierServiceImpl implements SupplierService {
     private void validateSupplierForCreateOrUpdate(Long id, String code, String shortname, String available) {
         // 关闭数据权限，避免因为没有数据权限，查询不到数据，进而导致唯一校验不正确
         DataPermissionUtils.executeIgnore(() -> {
-            validateSupplierExists(id);
             // 校验code唯一
             validateCodeExists(code);
             validateShortnameExists(shortname);
@@ -165,10 +165,8 @@ public class SupplierServiceImpl implements SupplierService {
 
     @VisibleForTesting
     private void validateSupplierExists(Long id) {
-        if (id == null) {
-            return;
-        }
-        if (supplierMapper.selectById(id) == null) {
+        SupplierDO supplierDO = supplierMapper.selectById(id);
+        if (supplierDO == null) {
             throw exception(SUPPLIER_NOT_EXISTS);
         }
     }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplieritem/SupplieritemServiceImpl.java

@@ -64,6 +64,7 @@ public class SupplieritemServiceImpl implements SupplieritemService {
     @Override
     public void updateSupplieritem(SupplieritemUpdateReqVO updateReqVO) {
         // 校验存在
+        validateSupplieritemExists(updateReqVO.getId());
 //        validateSupplieriteamForCreateOrUpdate(updateReqVO.getId(),updateReqVO.getSupplierCode(),
 //                updateReqVO.getItemCode(),updateReqVO.getPackUnit(),updateReqVO.getPackQty(),updateReqVO.getAvailable(),updateReqVO.getPackQtyOfContainer());
         SupplieritemDO supplieritemDO = supplieritemMapper.selectById(updateReqVO.getId());
@@ -173,7 +174,6 @@ public class SupplieritemServiceImpl implements SupplieritemService {
         String available) {
         // 关闭数据权限，避免因为没有数据权限，查询不到数据，进而导致唯一校验不正确
         DataPermissionUtils.executeIgnore(() -> {
-            validateSupplieritemExists(id);
             // 校验code唯一
             validateItemCodeExists(itemcode);
             validateSupperCodeExists(suppliercode);
@@ -184,10 +184,8 @@ public class SupplieritemServiceImpl implements SupplieritemService {
     }
     @VisibleForTesting
     private void validateSupplieritemExists(Long id) {
-        if (id == null) {
-            return;
-        }
-        if (supplieritemMapper.selectById(id) == null) {
+        SupplieritemDO supplieritemDO = supplieritemMapper.selectById(id);
+        if (supplieritemDO == null) {
             throw exception(SUPPLIERITEM_NOT_EXISTS);
         }
     }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/systemcalendar/SystemcalendarServiceImpl.java

@@ -44,6 +44,7 @@ public class SystemcalendarServiceImpl implements SystemcalendarService {
     @Override
     public void updateSystemcalendar(SystemcalendarUpdateReqVO updateReqVO) {
         // 校验存在
+        validateSystemcalendarExists(updateReqVO.getId());
         validateSystemcalendarForCreateOrUpdate(updateReqVO.getId(),updateReqVO.getModule(),updateReqVO.getAvailable());
         // 更新
         SystemcalendarDO updateObj = SystemcalendarConvert.INSTANCE.convert(updateReqVO);

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/team/TeamServiceImpl.java

@@ -52,6 +52,7 @@ public class TeamServiceImpl implements TeamService {
     @Override
     public void updateTeam(TeamUpdateReqVO updateReqVO) {
         // 校验存在
+        validateTeamExists(updateReqVO.getId());
         validateTeamForCreateOrUpdate(updateReqVO.getId(),updateReqVO.getCode(),updateReqVO.getAvailable());
         // 更新
         TeamDO updateObj = TeamConvert.INSTANCE.convert(updateReqVO);
@@ -157,7 +158,6 @@ public class TeamServiceImpl implements TeamService {
     private void validateTeamForCreateOrUpdate(Long id, String code, String available) {
         // 关闭数据权限，避免因为没有数据权限，查询不到数据，进而导致唯一校验不正确
         DataPermissionUtils.executeIgnore(() -> {
-            validateTeamExists(id);
             // 校验code唯一
             validateCodeExists(id,code);
             validateAvailableExists(available);

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/warehouse/WarehouseServiceImpl.java

@@ -55,6 +55,7 @@ public class WarehouseServiceImpl implements WarehouseService {
     @Override
     public void updateWarehouse(WarehouseUpdateReqVO updateReqVO) {
         // 校验存在
+        validateWarehouseExists(updateReqVO.getId());
         validateWarehouseForCreateOrUpdate(updateReqVO.getCode(),updateReqVO.getAvailable());
         // 更新
         WarehouseDO updateObj = WarehouseConvert.INSTANCE.convert(updateReqVO);

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/workshop/WorkshopServiceImpl.java

@@ -52,6 +52,7 @@ public class WorkshopServiceImpl implements WorkshopService {
     @Override
     public void updateWorkshop(WorkshopUpdateReqVO updateReqVO) {
         // 校验存在
+        validateWorkshopExists(updateReqVO.getId());
         validateWorkshopForCreateOrUpdate(updateReqVO.getCode(),updateReqVO.getAvailable());
         // 更新
         WorkshopDO updateObj = WorkshopConvert.INSTANCE.convert(updateReqVO);

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/workstation/WorkstationServiceImpl.java

@@ -68,9 +68,9 @@ public class WorkstationServiceImpl implements WorkstationService {
 
     @Override
     public void updateWorkstation(WorkstationUpdateReqVO updateReqVO) {
-        validateWorkstationForCreateOrUpdate(updateReqVO.getCode(),updateReqVO.getWorkshopCode(),updateReqVO.getProductionLineCode(),updateReqVO.getAvailable(),updateReqVO.getRawLocationCode(),updateReqVO.getFgLocationCode());
         // 校验存在
         validateWorkstationExists(updateReqVO.getId());
+        validateWorkstationForCreateOrUpdate(updateReqVO.getCode(),updateReqVO.getWorkshopCode(),updateReqVO.getProductionLineCode(),updateReqVO.getAvailable(),updateReqVO.getRawLocationCode(),updateReqVO.getFgLocationCode());
         // 更新
         WorkstationDO updateObj = WorkstationConvert.INSTANCE.convert(updateReqVO);
         workstationMapper.updateById(updateObj);