diff --git a/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/ErrorCodeConstants.java b/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/ErrorCodeConstants.java index a13cdca5..59bb4fdb 100644 --- a/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/ErrorCodeConstants.java +++ b/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/ErrorCodeConstants.java @@ -360,8 +360,12 @@ public interface ErrorCodeConstants { ErrorCode PARAMSETTING_VALUE_SCOPE_NOT_EXISTS = new ErrorCode(1_000_062_007, "值范围不存在"); //采购订单主ErrorCode ErrorCode PURCHASE_MAIN_NOT_EXISTS = new ErrorCode(1_000_063_000, "采购订单主不存在"); + //采购订单ErrorCode + ErrorCode PURCHASE_CLOSED_NOT_EXISTS = new ErrorCode(1_000_063_001, "采购订单已关闭"); //采购订单子ErrorCode ErrorCode PURCHASE_DETAIL_NOT_EXISTS = new ErrorCode(1_000_063_001, "采购订单子不存在"); + //采购订单ErrorCode + ErrorCode PURCHASE_DETAIL_NUMBER_NOT_EXISTS = new ErrorCode(1_000_063_001, "采购订单明细订单号不存在"); //采购索赔申请主ErrorCode ErrorCode PURCHASECLAIM_REQUEST_MAIN_NOT_EXISTS = new ErrorCode(1_000_064_000, "采购索赔申请主不存在"); //采购索赔申请主ErrorCode @@ -754,5 +758,11 @@ public interface ErrorCodeConstants { ErrorCode TRANSACTION_NOT_EXISTS = new ErrorCode(1_000_164_000, "库存事务不存在"); //库存事务ErrorCode ErrorCode TRANSFERLOG_NOT_EXISTS = new ErrorCode(1_000_165_000, "库存转移日志不存在"); + //生产线与零件关系ErrorCode + ErrorCode PRODUCTIONLINEITEM_PITEM_NOT_EXISTS = new ErrorCode(1_000_166_000, "生产线与零件关系无效"); + + //生产线与零件关系ErrorCode + ErrorCode PDOCK_NOT_EXISTS = new ErrorCode(1_000_166_000, "收货口不存在"); + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dock/DockController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dock/DockController.java index 634839be..7edeb058 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dock/DockController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dock/DockController.java @@ -1,5 +1,5 @@ package com.win.module.wms.controller.dock; - +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.framework.common.pojo.CommonResult; import com.win.framework.common.pojo.PageResult; import com.win.framework.dict.core.util.DictFrameworkUtils; @@ -8,6 +8,7 @@ import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.wms.controller.dock.vo.*; import com.win.module.wms.convert.dock.DockConvert; import com.win.module.wms.dal.dataobject.dock.DockDO; +import com.win.module.wms.dal.mysql.dock.DockMapper; import com.win.module.wms.enums.DictTypeConstants; import com.win.module.wms.service.dock.DockService; import io.swagger.v3.oas.annotations.Operation; @@ -18,7 +19,6 @@ import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; - import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; @@ -27,8 +27,10 @@ import java.time.LocalDateTime; import java.time.ZoneOffset; import java.util.*; +import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.win.framework.common.pojo.CommonResult.success; import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; +import static com.win.module.wms.enums.ErrorCodeConstants.*; @Tag(name = "管理后台 - 月台") @RestController @@ -39,6 +41,9 @@ public class DockController { @Resource private DockService dockService; + @Resource + private DockMapper dockMapper; + @PostMapping("/create") @Operation(summary = "创建月台") @PreAuthorize("@ss.hasPermission('wms:dock:create')") @@ -135,4 +140,9 @@ public class DockController { String url = ExcelUtils.writeLocalFile("月台导入错误数据" + LocalDateTime.now().toEpochSecond(ZoneOffset.of("+8")) + ".xls", "错误列表", errorList); returnMap.put("errorFile", url); }} + + + + + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/ItembasicController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/ItembasicController.java index a8b88062..33d90a50 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/ItembasicController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/ItembasicController.java @@ -34,7 +34,7 @@ import java.util.*; import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.win.framework.common.pojo.CommonResult.success; import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; -import static com.win.module.wms.enums.ErrorCodeConstants.ITEMBASIC_CODE_EXISTS; +import static com.win.module.wms.enums.ErrorCodeConstants.*; @Tag(name = "管理后台 - 物品基本信息") @RestController @@ -205,4 +205,6 @@ public class ItembasicController { return success(returnMap); } + + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/location/LocationController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/location/LocationController.java index 89a2ac09..34ae74ac 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/location/LocationController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/location/LocationController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.location; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.framework.common.pojo.CommonResult; import com.win.framework.common.pojo.PageResult; import com.win.framework.dict.core.util.DictFrameworkUtils; @@ -8,6 +9,7 @@ import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.wms.controller.location.vo.*; import com.win.module.wms.convert.location.LocationConvert; import com.win.module.wms.dal.dataobject.location.LocationDO; +import com.win.module.wms.dal.mysql.location.LocationMapper; import com.win.module.wms.enums.DictTypeConstants; import com.win.module.wms.service.location.LocationService; import io.swagger.v3.oas.annotations.Operation; @@ -27,8 +29,10 @@ import java.time.LocalDateTime; import java.time.ZoneOffset; import java.util.*; +import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.win.framework.common.pojo.CommonResult.success; import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; +import static com.win.module.wms.enums.ErrorCodeConstants.LOCATION_NOT_EXISTS; @Tag(name = "管理后台 - 库位") @RestController @@ -38,6 +42,8 @@ public class LocationController { @Resource private LocationService locationService; + @Resource + private LocationMapper locationMapper; @PostMapping("/create") @Operation(summary = "创建库位") @@ -135,4 +141,21 @@ public class LocationController { returnMap.put("errorFile", url); } } + public LocationDO selectLocation(String pcode) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("code",pcode); + LocationDO locationDO = locationMapper.selectOne(queryWrapper); + if(locationDO != null && "TRUE".equals(locationDO.getAvailable())){ + return locationDO; + }else { + throw exception(LOCATION_NOT_EXISTS); + } + } + + //库位号有效，状态正确 + @GetMapping("/iii") + public LocationDO selectLocationExist(String locationCode) { + LocationDO locationDO = selectLocation(locationCode); + return locationDO; + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageMassage/PackageController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageMassage/PackageController.java index 5dfba307..f5fb37be 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageMassage/PackageController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageMassage/PackageController.java @@ -92,17 +92,6 @@ public class PackageController { PageResult pageResult = packageService.getPackagePage(pageVO); return success(PackageConvert.INSTANCE.convertPage(pageResult)); } - @GetMapping("/pppp") - public PackageDO okkk(String number) { - QueryWrapper queryWrapper = new QueryWrapper(); - queryWrapper.eq("number",number); - PackageDO packageDO = packageMapper.selectOne(queryWrapper); - if(packageDO != null){ - return packageDO; - }else { - throw exception(PACKAGE_NOT_EXISTS); - } - } @GetMapping("/export-excel") @Operation(summary = "导出包装 Excel") @PreAuthorize("@ss.hasPermission('wms:package:export')") @@ -110,6 +99,7 @@ public class PackageController { public void exportPackageExcel(@Valid PackageExportReqVO exportReqVO, HttpServletResponse response) throws IOException { List list = packageService.getPackageList(exportReqVO); + // 导出 Excel List datas = PackageConvert.INSTANCE.convertList02(list); ExcelUtils.write(response, "包装.xls", "数据", PackageExcelVO.class, datas); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/warehouse/WarehouseController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/warehouse/WarehouseController.java index d5bd947a..e7b57f30 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/warehouse/WarehouseController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/warehouse/WarehouseController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.warehouse; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.framework.common.pojo.CommonResult; import com.win.framework.common.pojo.PageResult; import com.win.framework.dict.core.util.DictFrameworkUtils; @@ -11,6 +12,7 @@ import com.win.module.wms.controller.warehouse.vo.*; import com.win.module.wms.controller.workshop.vo.WorkshopImportExcelVo; import com.win.module.wms.convert.warehouse.WarehouseConvert; import com.win.module.wms.dal.dataobject.warehouse.WarehouseDO; +import com.win.module.wms.dal.mysql.warehouse.WarehouseMapper; import com.win.module.wms.enums.DictTypeConstants; import com.win.module.wms.service.warehouse.WarehouseService; import io.swagger.v3.oas.annotations.Operation; @@ -30,8 +32,10 @@ import java.time.LocalDateTime; import java.time.ZoneOffset; import java.util.*; +import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.win.framework.common.pojo.CommonResult.success; import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; +import static com.win.module.wms.enums.ErrorCodeConstants.WAREHOUSE_NOT_EXISTS; @Tag(name = "管理后台 - 仓库") @RestController @@ -41,7 +45,8 @@ public class WarehouseController { @Resource private WarehouseService warehouseService; - + @Resource + private WarehouseMapper warehouseMapper; @PostMapping("/create") @Operation(summary = "创建仓库") @PreAuthorize("@ss.hasPermission('wms:warehouse:create')") @@ -142,6 +147,28 @@ public class WarehouseController { } return success(returnMap); } + @GetMapping("/demo") + public WarehouseDO LabelExist(String code) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("code",code); + WarehouseDO warehouseDO = warehouseMapper.selectOne(queryWrapper); + if(warehouseDO != null&& warehouseDO.getAvailable().equals("TRUE")){ + return warehouseDO; + }else { + throw exception(WAREHOUSE_NOT_EXISTS); + } + } + @GetMapping("/tenm") + public WarehouseDO WarehouseExist(String code) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("code",code); + WarehouseDO warehouseDO = warehouseMapper.selectOne(queryWrapper); + if(warehouseDO != null&& warehouseDO.getAvailable().equals("TRUE")){ + return warehouseDO; + }else { + throw exception(WAREHOUSE_NOT_EXISTS); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customer/CustomerService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customer/CustomerService.java index ce015715..d22caba5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customer/CustomerService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customer/CustomerService.java @@ -70,4 +70,6 @@ public interface CustomerService { List getCustomerList(CustomerExportReqVO exportReqVO); List importCustomerList(List customers, Integer mode, Boolean updatePart); + + public CustomerDO CustomerExist(String code); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customer/CustomerServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customer/CustomerServiceImpl.java index 7dd08b87..73ab8a5c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customer/CustomerServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customer/CustomerServiceImpl.java @@ -2,6 +2,7 @@ package com.win.module.wms.service.customer; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.google.common.annotations.VisibleForTesting; import com.win.framework.common.exception.ServiceException; import com.win.framework.common.pojo.PageResult; @@ -10,6 +11,7 @@ import com.win.module.wms.controller.customer.vo.*; import com.win.module.wms.convert.customer.CustomerConvert; import com.win.module.wms.dal.dataobject.currencyexchange.CurrencyexchangeDO; import com.win.module.wms.dal.dataobject.customer.CustomerDO; +import com.win.module.wms.dal.dataobject.warehouse.WarehouseDO; import com.win.module.wms.dal.mysql.customer.CustomerMapper; import org.springframework.stereotype.Service; import org.springframework.transaction.interceptor.TransactionAspectSupport; @@ -170,4 +172,17 @@ public class CustomerServiceImpl implements CustomerService { } } + public CustomerDO CustomerExist(String code) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("code",code); + CustomerDO customerDO =customerMapper.selectOne(queryWrapper); + if(customerDO != null&& customerDO.getAvailable().equals("TRUE")){ + return customerDO; + }else { + throw exception(WAREHOUSE_NOT_EXISTS); + } + } + + + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerdock/CustomerdockServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerdock/CustomerdockServiceImpl.java index fd05bd6e..c4eb86df 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerdock/CustomerdockServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerdock/CustomerdockServiceImpl.java @@ -2,6 +2,7 @@ package com.win.module.wms.service.customerdock; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.google.common.annotations.VisibleForTesting; import com.win.framework.common.exception.ServiceException; import com.win.framework.common.pojo.PageResult; @@ -9,6 +10,7 @@ import com.win.framework.datapermission.core.util.DataPermissionUtils; import com.win.module.wms.controller.customerdock.vo.*; import com.win.module.wms.convert.customerdock.CustomerdockConvert; import com.win.module.wms.dal.dataobject.currencyexchange.CurrencyexchangeDO; +import com.win.module.wms.dal.dataobject.customer.CustomerDO; import com.win.module.wms.dal.dataobject.customerdock.CustomerdockDO; import com.win.module.wms.dal.mysql.customerdock.CustomerdockMapper; import org.springframework.stereotype.Service; @@ -183,5 +185,17 @@ public class CustomerdockServiceImpl implements CustomerdockService { throw exception(CUSTOMERDOCK_AVAILABLE_NOT_EXISTS); } } + public CustomerdockDO CustomerExist(String code) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("code",code); + CustomerdockDO customerdockDO =customerdockMapper.selectOne(queryWrapper); + if(customerdockDO != null&& customerdockDO.getAvailable().equals("TRUE")){ + return customerdockDO; + }else { + throw exception(CUSTOMERDOCK_NOT_EXISTS); + } + } + + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/dock/DockService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/dock/DockService.java index af74d6b7..2ae4d02b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/dock/DockService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/dock/DockService.java @@ -70,4 +70,6 @@ public interface DockService { List getDockList(DockExportReqVO exportReqVO); List dockimportDockList(List docks, Integer mode, Boolean updatePart); + //收货口有效，状态正确 + public DockDO DockExist(String code); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/dock/DockServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/dock/DockServiceImpl.java index 416fd6c7..d8f39d6a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/dock/DockServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/dock/DockServiceImpl.java @@ -2,6 +2,7 @@ package com.win.module.wms.service.dock; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.google.common.annotations.VisibleForTesting; import com.win.framework.common.exception.ServiceException; import com.win.framework.common.pojo.PageResult; @@ -9,6 +10,7 @@ import com.win.framework.datapermission.core.util.DataPermissionUtils; import com.win.module.wms.controller.dock.vo.*; import com.win.module.wms.convert.dock.DockConvert; import com.win.module.wms.dal.dataobject.dock.DockDO; +import com.win.module.wms.dal.dataobject.warehouse.WarehouseDO; import com.win.module.wms.dal.mysql.dock.DockMapper; import org.springframework.stereotype.Service; import org.springframework.transaction.interceptor.TransactionAspectSupport; @@ -182,4 +184,22 @@ public class DockServiceImpl implements DockService { throw exception(DOCK_AVAILABLE_NOT_EXISTS); } } + + //收货口有效，状态正确 + public DockDO DockExist(String code) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("code",code); + DockDO dockDO = dockMapper.selectOne(queryWrapper); + if(dockDO != null&& dockDO.getAvailable().equals("TRUE")){ + return dockDO; + }else { + throw exception(PDOCK_NOT_EXISTS); + } + } + + + + + + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itembasic/ItembasicServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itembasic/ItembasicServiceImpl.java index df30b934..b6dc09e4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itembasic/ItembasicServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itembasic/ItembasicServiceImpl.java @@ -254,7 +254,7 @@ public class ItembasicServiceImpl implements ItembasicService { if(itembasicDO != null && itembasicDO.getAvailable().equals("TRUE")){ return itembasicDO; }else { - throw exception(ITEMBASIC_CODE_NOT_EXISTS); + throw exception(ITEMBASIC_NOT_EXISTS); } } //物料有效，状态正确 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/location/LocationService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/location/LocationService.java index e46d60dd..ff121a63 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/location/LocationService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/location/LocationService.java @@ -70,4 +70,5 @@ public interface LocationService { List getLocationList(LocationExportReqVO exportReqVO); List importLocationList(List locations, Integer mode, Boolean updatePart); + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/location/LocationServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/location/LocationServiceImpl.java index 359033b0..e08001cc 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/location/LocationServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/location/LocationServiceImpl.java @@ -2,12 +2,14 @@ package com.win.module.wms.service.location; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.google.common.annotations.VisibleForTesting; import com.win.framework.common.exception.ServiceException; import com.win.framework.common.pojo.PageResult; import com.win.framework.datapermission.core.util.DataPermissionUtils; import com.win.module.wms.controller.location.vo.*; import com.win.module.wms.convert.location.LocationConvert; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import com.win.module.wms.dal.dataobject.location.LocationDO; import com.win.module.wms.dal.mysql.location.LocationMapper; import org.springframework.stereotype.Service; @@ -214,4 +216,6 @@ public class LocationServiceImpl implements LocationService { throw exception(LOCATION_AVAILABLE_NOT_EXISTS); } } + + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packageMassage/PackageService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packageMassage/PackageService.java index 648bcda3..433a6711 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packageMassage/PackageService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packageMassage/PackageService.java @@ -70,4 +70,8 @@ public interface PackageService { * @return 包装列表 */ List getPackageList(PackageExportReqVO exportReqVO); + + PackageDO LabelExist(String number); + + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packageMassage/PackageServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packageMassage/PackageServiceImpl.java index 6591cd1f..14ff885b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packageMassage/PackageServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packageMassage/PackageServiceImpl.java @@ -85,5 +85,15 @@ public class PackageServiceImpl implements PackageService { public List getPackageList(PackageExportReqVO exportReqVO) { return packageMapper.selectList(exportReqVO); } - + @Override + public PackageDO LabelExist(String number) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("number",number); + PackageDO packageDO = packageMapper.selectOne(queryWrapper); + if(packageDO != null){ + return packageDO; + }else { + throw exception(PACKAGE_NOT_EXISTS); + } + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionline/ProductionlineService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionline/ProductionlineService.java index 272dc7e0..67a020f8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionline/ProductionlineService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionline/ProductionlineService.java @@ -70,4 +70,5 @@ public interface ProductionlineService { List getProductionlineList(ProductionlineExportReqVO exportReqVO); List importProductionlineList(List productionlines, Integer mode, Boolean updatePart); + public ProductionlineDO ProductionlineExist(String code); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionline/ProductionlineServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionline/ProductionlineServiceImpl.java index 846818a0..c56cbf9f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionline/ProductionlineServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionline/ProductionlineServiceImpl.java @@ -2,12 +2,14 @@ package com.win.module.wms.service.productionline; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.google.common.annotations.VisibleForTesting; import com.win.framework.common.exception.ServiceException; import com.win.framework.common.pojo.PageResult; import com.win.framework.datapermission.core.util.DataPermissionUtils; import com.win.module.wms.controller.productionline.vo.*; import com.win.module.wms.convert.productionline.ProductionlineConvert; +import com.win.module.wms.dal.dataobject.customerdock.CustomerdockDO; import com.win.module.wms.dal.dataobject.owner.OwnerDO; import com.win.module.wms.dal.dataobject.productionline.ProductionlineDO; import com.win.module.wms.dal.mysql.productionline.ProductionlineMapper; @@ -165,4 +167,17 @@ public class ProductionlineServiceImpl implements ProductionlineService { throw exception(PRODUCTIONLINE_AVAILABLE_NOT_EXISTS); } } + public ProductionlineDO ProductionlineExist(String code) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("code",code); + ProductionlineDO productionlineDO =productionlineMapper.selectOne(queryWrapper); + if(productionlineDO != null&& productionlineDO.getAvailable().equals("TRUE")){ + return productionlineDO; + }else { + throw exception(PRODUCTIONLINEITEM_PITEM_NOT_EXISTS); + } + } + + + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionlineitem/ProductionlineitemService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionlineitem/ProductionlineitemService.java index 81e3862e..0fd5a2b6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionlineitem/ProductionlineitemService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionlineitem/ProductionlineitemService.java @@ -2,6 +2,7 @@ package com.win.module.wms.service.productionlineitem; import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productionlineitem.vo.*; +import com.win.module.wms.dal.dataobject.productionline.ProductionlineDO; import com.win.module.wms.dal.dataobject.productionlineitem.ProductionlineitemDO; import javax.validation.Valid; @@ -70,4 +71,5 @@ public interface ProductionlineitemService { List getProductionlineitemList(ProductionlineitemExportReqVO exportReqVO); List importProductionlineItemList(List productionlineItems, Integer mode, Boolean updatePart); + public ProductionlineitemDO ProductionlineitemExist(String code, String linecode); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionlineitem/ProductionlineitemServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionlineitem/ProductionlineitemServiceImpl.java index 9e5ebdab..c34f71a0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionlineitem/ProductionlineitemServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionlineitem/ProductionlineitemServiceImpl.java @@ -1,12 +1,14 @@ package com.win.module.wms.service.productionlineitem; import cn.hutool.core.collection.CollUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.google.common.annotations.VisibleForTesting; import com.win.framework.common.exception.ServiceException; import com.win.framework.common.pojo.PageResult; import com.win.framework.datapermission.core.util.DataPermissionUtils; import com.win.module.wms.controller.productionlineitem.vo.*; import com.win.module.wms.convert.productionlineitem.ProductionlineitemConvert; +import com.win.module.wms.dal.dataobject.customerdock.CustomerdockDO; import com.win.module.wms.dal.dataobject.owner.OwnerDO; import com.win.module.wms.dal.dataobject.productionlineitem.ProductionlineitemDO; import com.win.module.wms.dal.mysql.productionlineitem.ProductionlineitemMapper; @@ -36,8 +38,8 @@ public class ProductionlineitemServiceImpl implements ProductionlineitemService @Override public Long createProductionlineitem(ProductionlineitemCreateReqVO createReqVO) { - validateProcessForCreateOrUpdate(createReqVO.getId(),createReqVO.getFgLocationCode(),createReqVO.getProductionLineCode() - ,createReqVO.getItemCode(),createReqVO.getAvailable()); + validateProcessForCreateOrUpdate(createReqVO.getId(), createReqVO.getFgLocationCode(), createReqVO.getProductionLineCode() + , createReqVO.getItemCode(), createReqVO.getAvailable()); // 插入 ProductionlineitemDO productionlineitem = ProductionlineitemConvert.INSTANCE.convert(createReqVO); productionlineitemMapper.insert(productionlineitem); @@ -48,8 +50,8 @@ public class ProductionlineitemServiceImpl implements ProductionlineitemService @Override public void updateProductionlineitem(ProductionlineitemUpdateReqVO updateReqVO) { // 校验存在 - validateProcessForCreateOrUpdate(updateReqVO.getId(),updateReqVO.getFgLocationCode(),updateReqVO.getProductionLineCode() - ,updateReqVO.getItemCode(),updateReqVO.getAvailable()); + validateProcessForCreateOrUpdate(updateReqVO.getId(), updateReqVO.getFgLocationCode(), updateReqVO.getProductionLineCode() + , updateReqVO.getItemCode(), updateReqVO.getAvailable()); // 更新 ProductionlineitemDO updateObj = ProductionlineitemConvert.INSTANCE.convert(updateReqVO); productionlineitemMapper.updateById(updateObj); @@ -92,31 +94,32 @@ public class ProductionlineitemServiceImpl implements ProductionlineitemService productionlineItems.forEach(productionlineItem -> { // 校验，判断是否有不符合的原因 try { - if(mode != null){ - validateProcessForCreateOrUpdate(null,productionlineItem.getFgLocationCode(),productionlineItem.getProductionLineCode() - ,productionlineItem.getItemCode(),productionlineItem.getAvailable());} + if (mode != null) { + validateProcessForCreateOrUpdate(null, productionlineItem.getFgLocationCode(), productionlineItem.getProductionLineCode() + , productionlineItem.getItemCode(), productionlineItem.getAvailable()); + } } catch (ServiceException ex) { errorList.add(productionlineItem); return; } // 判断如果不存在，在进行插入 OwnerDO existConfigurationSetting = null; - if (existConfigurationSetting == null&& mode != 3) { + if (existConfigurationSetting == null && mode != 3) { productionlineitemMapper.insert(ProductionlineitemConvert.INSTANCE.convert(productionlineItem)); - } - else if (existConfigurationSetting != null && mode != 2) {// 如果存在，判断是否允许更新 + } else if (existConfigurationSetting != null && mode != 2) {// 如果存在，判断是否允许更新 ProductionlineitemDO productionlineItemDo = ProductionlineitemConvert.INSTANCE.convert(productionlineItem); productionlineItemDo.setId(existConfigurationSetting.getId()); productionlineitemMapper.updateById(productionlineItemDo); } }); //错误不为空并非部分更新，手工回滚 - if(!errorList.isEmpty() && !updatePart) { + if (!errorList.isEmpty() && !updatePart) { TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); } return errorList; } - private void validateProcessForCreateOrUpdate(Long id, String fgLocationCode,String productionLineCode,String itemCode,String available) { + + private void validateProcessForCreateOrUpdate(Long id, String fgLocationCode, String productionLineCode, String itemCode, String available) { // 关闭数据权限，避免因为没有数据权限，查询不到数据，进而导致唯一校验不正确 DataPermissionUtils.executeIgnore(() -> { validateProductionlineitemExists(id); @@ -136,28 +139,47 @@ public class ProductionlineitemServiceImpl implements ProductionlineitemService throw exception(PRODUCTIONLINEITEM_NOT_EXISTS); } } + @VisibleForTesting private void validateFgLocationCodeExists(String fgLocationCode) { if (fgLocationCode.isEmpty()) { throw exception(PRODUCTIONLINEITEM_FGLOCATION_CODE_NOT_EXISTS); } } + @VisibleForTesting private void validateProductionLineCodeExists(String productionLineCode) { if (productionLineCode.isEmpty()) { throw exception(PRODUCTIONLINEITEM_PRODUCT_LINE_COED_NOT_EXISTS); } } + @VisibleForTesting private void validateItemCodeExists(String itemCode) { if (itemCode.isEmpty()) { throw exception(PRODUCTIONLINEITEM_ITEM_CODE_NOT_EXISTS); } } + @VisibleForTesting private void validateAvailableExists(String available) { if (available.isEmpty()) { throw exception(PRODUCTIONLINEITEM_AVAILABLE_NOT_EXISTS); } } + + public ProductionlineitemDO ProductionlineitemExist(String code, String linecode) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("code", code); + queryWrapper.eq("linecode", linecode); + ProductionlineitemDO productionlineitemDO = productionlineitemMapper.selectOne(queryWrapper); + if (productionlineitemDO != null && productionlineitemDO.getAvailable().equals("TRUE")) { + return productionlineitemDO; + } else { + throw exception(CUSTOMERDOCK_NOT_EXISTS); + } + } + + + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplier/SupplierService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplier/SupplierService.java index 446c456c..056ccf26 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplier/SupplierService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplier/SupplierService.java @@ -70,5 +70,5 @@ public interface SupplierService { List getSupplierList(SupplierExportReqVO exportReqVO); List importSupplierList(List importTeam, Integer mode, boolean updatePart); - + public SupplierDO supplierExist(String Supplier); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplier/SupplierServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplier/SupplierServiceImpl.java index 247f84ec..88ef1d76 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplier/SupplierServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplier/SupplierServiceImpl.java @@ -2,12 +2,14 @@ package com.win.module.wms.service.supplier; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.google.common.annotations.VisibleForTesting; import com.win.framework.common.exception.ServiceException; import com.win.framework.common.pojo.PageResult; import com.win.framework.datapermission.core.util.DataPermissionUtils; import com.win.module.wms.controller.supplier.vo.*; import com.win.module.wms.convert.supplier.SupplierConvert; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import com.win.module.wms.dal.dataobject.supplier.SupplierDO; import com.win.module.wms.dal.mysql.supplier.SupplierMapper; import org.springframework.stereotype.Service; @@ -170,7 +172,25 @@ public class SupplierServiceImpl implements SupplierService { } } - + public SupplierDO selectSupplier(String code) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("code",code); + SupplierDO supplierDO = supplierMapper.selectOne(queryWrapper); + if(supplierDO != null && supplierDO.getAvailable().equals("TRUE")){ + return supplierDO; + }else { + throw exception(STDCOSTPRICE_SUPPLIER_CODE_NOT_EXISTS); + } + } + //物料有效，状态正确 + public SupplierDO supplierExist(String Supplier) { + SupplierDO supplierDO = selectSupplier(Supplier); + if(supplierDO != null){ + return supplierDO; + }else { + throw exception(STDCOSTPRICE_SUPPLIER_CODE_NOT_EXISTS); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/warehouse/WarehouseService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/warehouse/WarehouseService.java index 34e83383..98bb73d6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/warehouse/WarehouseService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/warehouse/WarehouseService.java @@ -72,4 +72,8 @@ public interface WarehouseService { List importWarehouseList(List warehouses, Integer mode, boolean updatePart); + + //仓库有效，状态正确 + public WarehouseDO WarehouseExist(String code); + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/warehouse/WarehouseServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/warehouse/WarehouseServiceImpl.java index 0caa44f3..0b460925 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/warehouse/WarehouseServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/warehouse/WarehouseServiceImpl.java @@ -2,6 +2,7 @@ package com.win.module.wms.service.warehouse; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.google.common.annotations.VisibleForTesting; import com.win.framework.common.exception.ServiceException; import com.win.framework.common.pojo.PageResult; @@ -12,6 +13,7 @@ import com.win.module.wms.controller.warehouse.vo.WarehousePageReqVO; import com.win.module.wms.controller.warehouse.vo.WarehouseUpdateReqVO; import com.win.module.wms.controller.warehouse.vo.WarehouseImportExcelVo; import com.win.module.wms.convert.warehouse.WarehouseConvert; +import com.win.module.wms.dal.dataobject.packageMassage.PackageDO; import com.win.module.wms.dal.dataobject.warehouse.WarehouseDO; import com.win.module.wms.dal.mysql.warehouse.WarehouseMapper; import org.springframework.stereotype.Service; @@ -165,7 +167,17 @@ public class WarehouseServiceImpl implements WarehouseService { throw exception(WAREHOUSE_AVAIABLE_NOT_EXISTS); } } - + //仓库有效，状态正确 + public WarehouseDO WarehouseExist(String code) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("code",code); + WarehouseDO warehouseDO = warehouseMapper.selectOne(queryWrapper); + if(warehouseDO != null&& warehouseDO.getAvailable().equals("TRUE")){ + return warehouseDO; + }else { + throw exception(WAREHOUSE_NOT_EXISTS); + } + } }