diff --git a/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/DictTypeConstants.java b/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/DictTypeConstants.java index 4bcbea5d..07f6f46d 100644 --- a/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/DictTypeConstants.java +++ b/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/DictTypeConstants.java @@ -63,5 +63,6 @@ public interface DictTypeConstants { String REQUEST_MODE = "reqeust_mode";//申请模式 String LABEL_TYPE = "label_type";//标签类型 String CARRIER_TYPE = "carrier_type";//承运商类型 + String INVENTORY_STATUS = "inventory_status";//库存状态 } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/accountcalendar/AccountcalendarController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/accountcalendar/AccountcalendarController.java index 6f116e12..addcdb89 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/accountcalendar/AccountcalendarController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/accountcalendar/AccountcalendarController.java @@ -1,6 +1,7 @@ package com.win.module.wms.controller.accountcalendar; import com.win.framework.common.pojo.CommonResult; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.dict.core.util.DictFrameworkUtils; import com.win.framework.excel.core.util.ExcelUtils; @@ -94,6 +95,19 @@ public class AccountcalendarController { return success(AccountcalendarConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得账期日历分页") + @PreAuthorize("@ss.hasPermission('wms:accountcalendar:query')") + public CommonResult> getItembasicSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = accountcalendarService.getAccountcalendarSenior(conditions); + PageResult result = AccountcalendarConvert.INSTANCE.convertPage(pageResult); + for(AccountcalendarRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出账期日历 Excel") @PreAuthorize("@ss.hasPermission('wms:accountcalendar:export')") @@ -107,8 +121,10 @@ public class AccountcalendarController { AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); //后端创建个字段作为前端展示的虚拟字段 vo.setCreator(user.getNickname()); - } - ExcelUtils.write(response, "账期日历.xls", "数据", AccountcalendarExcelVO.class, datas); + }Map mapDropDown = new HashMap<>(); + String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); + mapDropDown.put(6, available); + ExcelUtils.write(response, "账期日历.xls", "数据", AccountcalendarExcelVO.class, datas,mapDropDown); } @GetMapping("/get-import-template") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/areabasic/AreabasicController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/areabasic/AreabasicController.java index e2535fc9..71bdf01e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/areabasic/AreabasicController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/areabasic/AreabasicController.java @@ -1,13 +1,13 @@ package com.win.module.wms.controller.areabasic; import com.win.framework.common.pojo.CommonResult; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.dict.core.util.DictFrameworkUtils; import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.accountcalendar.vo.AccountcalendarExcelVO; import com.win.module.wms.controller.areabasic.vo.*; import com.win.module.wms.convert.areabasic.AreabasicConvert; import com.win.module.wms.dal.dataobject.areabasic.AreabasicDO; @@ -110,7 +110,19 @@ public class AreabasicController { } ExcelUtils.write(response, "库区.xls", "数据", AreabasicExcelVO.class, datas); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得库区分页") + @PreAuthorize("@ss.hasPermission('wms:areabasic:query')") + public CommonResult> getAreabasicSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = areabasicService.getAreabasicSenior(conditions); + PageResult result = AreabasicConvert.INSTANCE.convertPage(pageResult); + for(AreabasicRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/get-import-template") @Operation(summary = "获得导入库区模板") public void importTemplate(HttpServletResponse response) throws IOException { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/balance/BalanceController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/balance/BalanceController.java index 0753708e..6ad4fa3c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/balance/BalanceController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/balance/BalanceController.java @@ -1,9 +1,13 @@ package com.win.module.wms.controller.balance; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.dict.core.util.DictFrameworkUtils; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.backflushRecord.vo.BackflushRecordDetailbExcelVO; import com.win.module.wms.controller.balance.vo.*; +import com.win.module.wms.controller.barcode.vo.BarcodeImportExcelVo; +import com.win.module.wms.enums.DictTypeConstants; +import io.swagger.v3.oas.annotations.Parameters; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -14,6 +18,8 @@ import io.swagger.v3.oas.annotations.Operation; import javax.validation.*; import javax.servlet.http.*; +import java.time.LocalDateTime; +import java.time.ZoneOffset; import java.util.*; import java.io.IOException; @@ -26,10 +32,10 @@ import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*; -import com.win.module.wms.controller.balance.vo.*; import com.win.module.wms.dal.dataobject.balance.BalanceDO; import com.win.module.wms.convert.balance.BalanceConvert; import com.win.module.wms.service.balance.BalanceService; +import org.springframework.web.multipart.MultipartFile; @Tag(name = "管理后台 - 库存余额") @RestController @@ -92,6 +98,19 @@ public class BalanceController { return success(BalanceConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得库存余额分页") + @PreAuthorize("@ss.hasPermission('wms:balance:query')") + public CommonResult> getBalanceSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = balanceService.getBalanceSenior(conditions); + PageResult result = BalanceConvert.INSTANCE.convertPage(pageResult); + for(BalanceRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出库存余额 Excel") @PreAuthorize("@ss.hasPermission('wms:balance:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/balance/vo/BalanceImportExcelVo.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/balance/vo/BalanceImportExcelVo.java new file mode 100644 index 00000000..c572f598 --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/balance/vo/BalanceImportExcelVo.java @@ -0,0 +1,115 @@ +package com.win.module.wms.controller.balance.vo; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.win.framework.excel.core.annotations.DictFormat; +import com.win.framework.excel.core.convert.DictConvert; +import com.win.module.wms.enums.DictTypeConstants; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; + +import java.math.BigDecimal; +import java.time.LocalDateTime; + +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +@Accessors(chain = false) // 设置 chain = false，避免用户导入有问题 +public class BalanceImportExcelVo { + + @ExcelProperty("包装号") + private String packingNumber; + + @ExcelProperty("器具代码") + private String containerNumber; + + @ExcelProperty("物料代码") + private String itemCode; + + @ExcelProperty("批次") + private String batch; + + @ExcelProperty("替代批次") + private String altBatch; + + @ExcelProperty("到货日期") + @ColumnWidth(value = 16) + private LocalDateTime arriveDate; + + @ExcelProperty("生产日期") + @ColumnWidth(value = 16) + private LocalDateTime produceDate; + + @ExcelProperty("失效日期") + @ColumnWidth(value = 16) + private LocalDateTime expireDate; + + @ExcelProperty(value = "库存状态", converter = DictConvert.class) + @DictFormat(DictTypeConstants.INVENTORY_STATUS) + private String inventoryStatus; + + @ExcelProperty("库位代码") + private String locationCode; + + @ExcelProperty("库位组代码") + private String locationGroupCode; + + @ExcelProperty("库区代码") + private String areaCode; + + @ExcelProperty("仓库代码") + private String warehouseCode; + + @ExcelProperty("ERP库位代码") + private String erpLocationCode; + + @ExcelProperty("货主代码") + private String ownerCode; + + @ExcelProperty(value = "计量单位", converter = DictConvert.class) + @DictFormat(DictTypeConstants.UOM) + private String uom; + + @ExcelProperty("数量") + private BigDecimal qty; + + @ExcelProperty("锁定数量") + private BigDecimal lockedQty; + + @ExcelProperty("可用数量") + private BigDecimal usableQty; + + @ExcelProperty("单价") + private BigDecimal singlePrice; + + @ExcelProperty("金额") + private BigDecimal amount; + + @ExcelProperty("入库时间") + @ColumnWidth(value = 16) + private LocalDateTime putInTime; + + @ExcelProperty(value = "是否冻结", converter = DictConvert.class) + @DictFormat(DictTypeConstants.TRUE_FALSE) + private String frozen; + + @ExcelProperty("冻结原因") + private String frozenReason; + + @ExcelProperty("最后事务号") + private String lastTransNumber; + + @ExcelProperty("重量") + private BigDecimal weight; + + @ExcelProperty("面积") + private BigDecimal area; + + @ExcelProperty("体积") + private BigDecimal volume; +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/balance/vo/BalanceRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/balance/vo/BalanceRespVO.java index 6f3d5804..082ae458 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/balance/vo/BalanceRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/balance/vo/BalanceRespVO.java @@ -3,10 +3,17 @@ package com.win.module.wms.controller.balance.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import java.time.LocalDateTime; + @Schema(description = "管理后台 - 库存余额 Response VO") @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) public class BalanceRespVO extends BalanceBaseVO { + @Schema(description = "创建时间") + private LocalDateTime createTime; + + @Schema(description = "创建者ID") + private String creator; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/barcode/BarcodeController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/barcode/BarcodeController.java index 82b53a8a..dad93d38 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/barcode/BarcodeController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/barcode/BarcodeController.java @@ -1,13 +1,13 @@ package com.win.module.wms.controller.barcode; import com.win.framework.common.pojo.CommonResult; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.dict.core.util.DictFrameworkUtils; import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.backflushRecord.vo.BackflushRecordDetailbExcelVO; import com.win.module.wms.controller.barcode.vo.*; import com.win.module.wms.convert.barcode.BarcodeConvert; import com.win.module.wms.dal.dataobject.barcode.BarcodeDO; @@ -94,7 +94,20 @@ public class BarcodeController { PageResult pageResult = barcodeService.getBarcodePage(pageVO); return success(BarcodeConvert.INSTANCE.convertPage(pageResult)); } - + + @PostMapping("/senior") + @Operation(summary = "高级搜索获得条码片段分页") + @PreAuthorize("@ss.hasPermission('wms:barcode:query')") + public CommonResult> getBarcodeSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = barcodeService.getBarcodeSenior(conditions); + PageResult result = BarcodeConvert.INSTANCE.convertPage(pageResult); + for(BarcodeRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出条码片段 Excel") @PreAuthorize("@ss.hasPermission('label:barcode:export')") @@ -109,7 +122,12 @@ public class BarcodeController { //后端创建个字段作为前端展示的虚拟字段 vo.setCreator(user.getNickname()); } - ExcelUtils.write(response, "条码片段.xls", "数据", BarcodeExcelVO.class, datas); + Map mapDropDown = new HashMap<>(); + String[] trimEnd = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); + mapDropDown.put(9, trimEnd); + String[] isEncypt = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); + mapDropDown.put(10, isEncypt); + ExcelUtils.write(response, "条码片段.xls", "数据", BarcodeExcelVO.class, datas,mapDropDown); } @GetMapping("/get-import-template") @Operation(summary = "获得导入库区模板") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/barcode/vo/BarcodeRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/barcode/vo/BarcodeRespVO.java index d3463ce3..ad703d7a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/barcode/vo/BarcodeRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/barcode/vo/BarcodeRespVO.java @@ -5,6 +5,8 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; +import java.time.LocalDateTime; + @Schema(description = "管理后台 - 条码片段 Response VO") @Data @EqualsAndHashCode(callSuper = true) @@ -14,4 +16,10 @@ public class BarcodeRespVO extends BarcodeBaseVO { @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "21607") private Long id; + @Schema(description = "创建时间") + private LocalDateTime createTime; + + @Schema(description = "创建者ID") + private String creator; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/bom/BomController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/bom/BomController.java index 6bd2f1f9..eea6c475 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/bom/BomController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/bom/BomController.java @@ -1,13 +1,13 @@ package com.win.module.wms.controller.bom; import com.win.framework.common.pojo.CommonResult; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.dict.core.util.DictFrameworkUtils; import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.barcode.vo.BarcodeExcelVO; import com.win.module.wms.controller.bom.vo.*; import com.win.module.wms.convert.bom.BomConvert; import com.win.module.wms.dal.dataobject.bom.BomDO; @@ -95,6 +95,21 @@ public class BomController { return success(BomConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物料清单分页") + @PreAuthorize("@ss.hasPermission('wms:bom:query')") + public CommonResult> getBomSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = bomService.getBomSenior(conditions); + PageResult result = BomConvert.INSTANCE.convertPage(pageResult); + for(BomRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + + @GetMapping("/export-excel") @Operation(summary = "导出物料清单 Excel") @PreAuthorize("@ss.hasPermission('wms:bom:export')") @@ -109,7 +124,12 @@ public class BomController { //后端创建个字段作为前端展示的虚拟字段 vo.setCreator(user.getNickname()); } - ExcelUtils.write(response, "物料清单.xls", "数据", BomExcelVO.class, datas); + Map mapDropDown = new HashMap<>(); + String[] componentUom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM); + mapDropDown.put(2, componentUom); + String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); + mapDropDown.put(7, available); + ExcelUtils.write(response, "物料清单.xls", "数据", BomExcelVO.class, datas,mapDropDown); } @GetMapping("/get-import-template") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/businesstype/BusinesstypeController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/businesstype/BusinesstypeController.java index aa50da6d..8c788472 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/businesstype/BusinesstypeController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/businesstype/BusinesstypeController.java @@ -1,13 +1,13 @@ package com.win.module.wms.controller.businesstype; import com.win.framework.common.pojo.CommonResult; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.dict.core.util.DictFrameworkUtils; import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.bom.vo.BomExcelVO; import com.win.module.wms.controller.businesstype.vo.*; import com.win.module.wms.convert.businesstype.BusinesstypeConvert; import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO; @@ -95,6 +95,20 @@ public class BusinesstypeController { return success(BusinesstypeConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:businesstype:query')") + public CommonResult> getBusinesstypeSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = businesstypeService.getBusinesstypeSenior(conditions); + PageResult result = BusinesstypeConvert.INSTANCE.convertPage(pageResult); + for(BusinesstypeRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + @GetMapping("/export-excel") @Operation(summary = "导出业务类型 Excel") @PreAuthorize("@ss.hasPermission('wms:businesstype:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/carrier/CarrierController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/carrier/CarrierController.java index bc2abdcb..b7b055a9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/carrier/CarrierController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/carrier/CarrierController.java @@ -1,13 +1,15 @@ package com.win.module.wms.controller.carrier; import com.win.framework.common.pojo.CommonResult; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.dict.core.util.DictFrameworkUtils; import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.businesstype.vo.BusinesstypeExcelVO; +import com.win.module.wms.controller.carrier.vo.CarrierExcelVO; +import com.win.module.wms.controller.carrier.vo.CarrierRespVO; import com.win.module.wms.controller.carrier.vo.*; import com.win.module.wms.convert.carrier.CarrierConvert; import com.win.module.wms.dal.dataobject.carrier.CarrierDO; @@ -94,7 +96,19 @@ public class CarrierController { PageResult pageResult = carrierService.getCarrierPage(pageVO); return success(CarrierConvert.INSTANCE.convertPage(pageResult)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:carrier:query')") + public CommonResult> getCarrierSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = carrierService.getCarrierSenior(conditions); + PageResult result = CarrierConvert.INSTANCE.convertPage(pageResult); + for(CarrierRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出承运商 Excel") @PreAuthorize("@ss.hasPermission('wms:carrier:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/condition/ConditionController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/condition/ConditionController.java index 57c00a6a..0bde0d4a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/condition/ConditionController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/condition/ConditionController.java @@ -1,15 +1,19 @@ package com.win.module.wms.controller.condition; import com.win.framework.common.pojo.CommonResult; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.dict.core.util.DictFrameworkUtils; import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; +import com.win.module.wms.controller.condition.vo.ConditionRespVO; import com.win.module.wms.controller.carrier.vo.CarrierExcelVO; import com.win.module.wms.controller.condition.vo.*; import com.win.module.wms.convert.condition.ConditionConvert; +import com.win.module.wms.convert.condition.ConditionConvert; +import com.win.module.wms.dal.dataobject.condition.ConditionDO; import com.win.module.wms.dal.dataobject.condition.ConditionDO; import com.win.module.wms.enums.DictTypeConstants; import com.win.module.wms.service.condition.ConditionService; @@ -94,7 +98,19 @@ public class ConditionController { PageResult pageResult = conditionService.getConditionPage(pageVO); return success(ConditionConvert.INSTANCE.convertPage(pageResult)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得工位分页") + @PreAuthorize("@ss.hasPermission('wms:condition:query')") + public CommonResult> getConditionSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = conditionService.getConditionSenior(conditions); + PageResult result = ConditionConvert.INSTANCE.convertPage(pageResult); + for(ConditionRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出条件 Excel") @PreAuthorize("@ss.hasPermission('wms:condition:export')") @@ -108,8 +124,10 @@ public class ConditionController { AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); //后端创建个字段作为前端展示的虚拟字段 vo.setCreator(user.getNickname()); - } - ExcelUtils.write(response, "条件.xls", "数据", ConditionExcelVO.class, datas); + }Map mapDropDown = new HashMap<>(); + String[] operator = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.STRATEGY_PARAM_OPEARTOR); + mapDropDown.put(3, operator); + ExcelUtils.write(response, "条件.xls", "数据", ConditionExcelVO.class, datas,mapDropDown); } @GetMapping("/get-import-template") @Operation(summary = "获得导入工位模板") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/condition/vo/ConditionRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/condition/vo/ConditionRespVO.java index a1017872..7c0d45f5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/condition/vo/ConditionRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/condition/vo/ConditionRespVO.java @@ -3,10 +3,17 @@ package com.win.module.wms.controller.condition.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import java.time.LocalDateTime; + @Schema(description = "管理后台 - 条件 Response VO") @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) public class ConditionRespVO extends ConditionBaseVO { + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) + private LocalDateTime createTime; + + @Schema(description = "创建者ID", requiredMode = Schema.RequiredMode.REQUIRED) + private String creator; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/configuration/ConfigurationController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/configuration/ConfigurationController.java index ea5492d4..deacee8e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/configuration/ConfigurationController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/configuration/ConfigurationController.java @@ -1,12 +1,13 @@ package com.win.module.wms.controller.configuration; import com.win.framework.common.pojo.CommonResult; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.condition.vo.ConditionExcelVO; +import com.win.module.wms.controller.configuration.vo.ConfigurationRespVO; import com.win.module.wms.controller.configuration.vo.*; import com.win.module.wms.convert.configuration.ConfigurationConvert; import com.win.module.wms.dal.dataobject.configuration.ConfigurationDO; @@ -92,7 +93,19 @@ public class ConfigurationController { PageResult pageResult = configurationService.getConfigurationPage(pageVO); return success(ConfigurationConvert.INSTANCE.convertPage(pageResult)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得配置分页") + @PreAuthorize("@ss.hasPermission('wms:configuration:query')") + public CommonResult> getConfigurationSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = configurationService.getConfigurationSenior(conditions); + PageResult result = ConfigurationConvert.INSTANCE.convertPage(pageResult); + for(ConfigurationRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出配置 Excel") @PreAuthorize("@ss.hasPermission('wms:configuration:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/configuration/vo/ConfigurationRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/configuration/vo/ConfigurationRespVO.java index d5fbfacb..e43888c2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/configuration/vo/ConfigurationRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/configuration/vo/ConfigurationRespVO.java @@ -3,10 +3,18 @@ package com.win.module.wms.controller.configuration.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import java.time.LocalDateTime; + @Schema(description = "管理后台 - 配置 Response VO") @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) public class ConfigurationRespVO extends ConfigurationBaseVO { + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) + private LocalDateTime createTime; + + @Schema(description = "创建者ID", requiredMode = Schema.RequiredMode.REQUIRED) + private String creator; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/configurationsetting/ConfigurationsettingController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/configurationsetting/ConfigurationsettingController.java index 189980a3..2c5c78b0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/configurationsetting/ConfigurationsettingController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/configurationsetting/ConfigurationsettingController.java @@ -1,13 +1,14 @@ package com.win.module.wms.controller.configurationsetting; import com.win.framework.common.pojo.CommonResult; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.dict.core.util.DictFrameworkUtils; import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.configuration.vo.ConfigurationExcelVO; +import com.win.module.wms.controller.configurationsetting.vo.ConfigurationsettingRespVO; import com.win.module.wms.controller.configurationsetting.vo.*; import com.win.module.wms.convert.configurationsetting.ConfigurationsettingConvert; import com.win.module.wms.dal.dataobject.configurationsetting.ConfigurationsettingDO; @@ -94,7 +95,19 @@ public class ConfigurationsettingController { PageResult pageResult = configurationsettingService.getConfigurationsettingPage(pageVO); return success(ConfigurationsettingConvert.INSTANCE.convertPage(pageResult)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得配置设置分页") + @PreAuthorize("@ss.hasPermission('wms:configurationsetting:query')") + public CommonResult> getConfigurationsettingSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = configurationsettingService.getConfigurationsettingSenior(conditions); + PageResult result = ConfigurationsettingConvert.INSTANCE.convertPage(pageResult); + for(ConfigurationsettingRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出配置设置 Excel") @PreAuthorize("@ss.hasPermission('wms:configurationsetting:export')") @@ -109,7 +122,14 @@ public class ConfigurationsettingController { //后端创建个字段作为前端展示的虚拟字段 vo.setCreator(user.getNickname()); } - ExcelUtils.write(response, "配置设置.xls", "数据", ConfigurationsettingExcelVO.class, datas); + Map mapDropDown = new HashMap<>(); + String[] strategyType = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.STRATEGY_TYPE); + mapDropDown.put(0, strategyType); + String[] isRequired = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); + mapDropDown.put(3, isRequired); + String[] dataType = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.DATA_TYPE); + mapDropDown.put(4, dataType); + ExcelUtils.write(response, "配置设置.xls", "数据", ConfigurationsettingExcelVO.class, datas,mapDropDown); } @GetMapping("/get-import-template") @Operation(summary = "获得导入配置模板") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/configurationsetting/vo/ConfigurationsettingRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/configurationsetting/vo/ConfigurationsettingRespVO.java index fcba394f..6306cad1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/configurationsetting/vo/ConfigurationsettingRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/configurationsetting/vo/ConfigurationsettingRespVO.java @@ -3,10 +3,16 @@ package com.win.module.wms.controller.configurationsetting.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import java.time.LocalDateTime; + @Schema(description = "管理后台 - 配置设置 Response VO") @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) public class ConfigurationsettingRespVO extends ConfigurationsettingBaseVO { + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) + private LocalDateTime createTime; + @Schema(description = "创建者ID", requiredMode = Schema.RequiredMode.REQUIRED) + private String creator; } 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 0044334c..a4d71891 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 @@ -144,7 +144,6 @@ public class ItembasicController { return success(result); } - @GetMapping("/export-excel") @Operation(summary = "导出物品基本信息 Excel") @PreAuthorize("@ss.hasPermission('wms:itembasic:export')") @@ -159,7 +158,42 @@ public class ItembasicController { //后端创建个字段作为前端展示的虚拟字段 vo.setCreator(user.getNickname()); } - ExcelUtils.write(response, "物品基本信息.xlsx", "数据", ItembasicExcelVO.class, datas); + Map mapDropDown = new HashMap<>(); + String[] status = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.ITEM_STATUS); + mapDropDown.put(4, status); + String[] uom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM); + mapDropDown.put(5, uom); + String[] altUom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM); + mapDropDown.put(6, altUom); + String[] isStdPack = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); + mapDropDown.put(7, isStdPack); + String[] enableBuy = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); + mapDropDown.put(8, enableBuy); + String[] enableMake = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); + mapDropDown.put(9, enableMake); + String[] enableOutsourcing = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); + mapDropDown.put(10, enableOutsourcing); + String[] isRecycled = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); + mapDropDown.put(11, isRecycled); + String[] isPhantom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); + mapDropDown.put(12, isPhantom); + String[] abcClass = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.ABC_CLASS); + mapDropDown.put(13, abcClass); + String[] type = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.ITEM_TYPE); + mapDropDown.put(14, type); + String[] category = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.ITEM_CATEGORY); + mapDropDown.put(15, category); + String[] itemGroup = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.ITEM_GROUP); + mapDropDown.put(16, itemGroup); + String[] color = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.ITEM_COLOR); + mapDropDown.put(17, color); + String[] configuration = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.ITEM_CONFIGURATION); + mapDropDown.put(18, configuration); + String[] eqLevel = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.EQ_LEVEL); + mapDropDown.put(20, eqLevel); + String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); + mapDropDown.put(22, available); + ExcelUtils.write(response, "物品基本信息.xlsx", "数据", ItembasicExcelVO.class, datas,mapDropDown); } @GetMapping("/get-import-template") @Operation(summary = "获得导入物品基本信息模板") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/backflushRecord/BackflushRecordDetailbController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/BackflushRecordDetailbController.java similarity index 89% rename from win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/backflushRecord/BackflushRecordDetailbController.java rename to win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/BackflushRecordDetailbController.java index c8645819..ec5c5a06 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/backflushRecord/BackflushRecordDetailbController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/BackflushRecordDetailbController.java @@ -1,35 +1,31 @@ -package com.win.module.wms.controller.backflushRecord; +package com.win.module.wms.controller.productreceiptRecord; +import com.win.framework.common.pojo.CommonResult; +import com.win.framework.common.pojo.PageResult; +import com.win.framework.excel.core.util.ExcelUtils; +import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.areabasic.vo.AreabasicExcelVO; -import com.win.module.wms.controller.backflushRecord.vo.*; -import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; +import com.win.module.wms.controller.productreceiptRecord.vo.*; +import com.win.module.wms.convert.productreceiptRecord.BackflushRecordDetailbConvert; +import com.win.module.wms.dal.dataobject.productreceiptRecord.BackflushRecordDetailbDO; +import com.win.module.wms.service.productreceiptRecord.BackflushRecordDetailbService; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; -import javax.validation.*; -import javax.servlet.http.*; -import java.util.*; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; import java.io.IOException; +import java.util.Collection; +import java.util.List; -import com.win.framework.common.pojo.PageResult; -import com.win.framework.common.pojo.CommonResult; import static com.win.framework.common.pojo.CommonResult.success; - -import com.win.framework.excel.core.util.ExcelUtils; - -import com.win.framework.operatelog.core.annotations.OperateLog; -import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*; - -import com.win.module.wms.controller.backflushRecord.vo.*; -import com.win.module.wms.dal.dataobject.backflushRecord.BackflushRecordDetailbDO; -import com.win.module.wms.convert.backflushRecord.BackflushRecordDetailbConvert; -import com.win.module.wms.service.backflushRecord.BackflushRecordDetailbService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 制品收货记录子") @RestController diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/backflushRecord/vo/BackflushRecordDetailbBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/vo/BackflushRecordDetailbBaseVO.java similarity index 94% rename from win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/backflushRecord/vo/BackflushRecordDetailbBaseVO.java rename to win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/vo/BackflushRecordDetailbBaseVO.java index baca4df3..7bda9c74 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/backflushRecord/vo/BackflushRecordDetailbBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/vo/BackflushRecordDetailbBaseVO.java @@ -1,12 +1,12 @@ -package com.win.module.wms.controller.backflushRecord.vo; +package com.win.module.wms.controller.productreceiptRecord.vo; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import java.util.*; -import java.time.LocalDateTime; -import javax.validation.constraints.*; +import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; +import javax.validation.constraints.NotNull; +import java.time.LocalDateTime; + import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/backflushRecord/vo/BackflushRecordDetailbCreateReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/vo/BackflushRecordDetailbCreateReqVO.java similarity index 67% rename from win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/backflushRecord/vo/BackflushRecordDetailbCreateReqVO.java rename to win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/vo/BackflushRecordDetailbCreateReqVO.java index 455f2e18..538adfd2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/backflushRecord/vo/BackflushRecordDetailbCreateReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/vo/BackflushRecordDetailbCreateReqVO.java @@ -1,7 +1,9 @@ -package com.win.module.wms.controller.backflushRecord.vo; +package com.win.module.wms.controller.productreceiptRecord.vo; -import lombok.*; import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; @Schema(description = "管理后台 - 制品收货记录子创建 Request VO") @Data diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/backflushRecord/vo/BackflushRecordDetailbExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/vo/BackflushRecordDetailbExcelVO.java similarity index 93% rename from win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/backflushRecord/vo/BackflushRecordDetailbExcelVO.java rename to win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/vo/BackflushRecordDetailbExcelVO.java index 12a52584..174cb7c7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/backflushRecord/vo/BackflushRecordDetailbExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/vo/BackflushRecordDetailbExcelVO.java @@ -1,14 +1,12 @@ -package com.win.module.wms.controller.backflushRecord.vo; - -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import java.util.*; -import java.time.LocalDateTime; +package com.win.module.wms.controller.productreceiptRecord.vo; import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.win.framework.excel.core.annotations.DictFormat; import com.win.framework.excel.core.convert.DictConvert; +import lombok.Data; + +import java.time.LocalDateTime; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/backflushRecord/vo/BackflushRecordDetailbExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/vo/BackflushRecordDetailbExportReqVO.java similarity index 93% rename from win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/backflushRecord/vo/BackflushRecordDetailbExportReqVO.java rename to win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/vo/BackflushRecordDetailbExportReqVO.java index 2cea0c29..82768e3f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/backflushRecord/vo/BackflushRecordDetailbExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/vo/BackflushRecordDetailbExportReqVO.java @@ -1,12 +1,11 @@ -package com.win.module.wms.controller.backflushRecord.vo; +package com.win.module.wms.controller.productreceiptRecord.vo; -import lombok.*; -import java.util.*; import io.swagger.v3.oas.annotations.media.Schema; -import com.win.framework.common.pojo.PageParam; -import java.time.LocalDateTime; +import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; + import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @Schema(description = "管理后台 - 制品收货记录子 Excel 导出 Request VO，参数和 BackflushRecordDetailbPageReqVO 是一致的") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/backflushRecord/vo/BackflushRecordDetailbPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/vo/BackflushRecordDetailbPageReqVO.java similarity index 93% rename from win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/backflushRecord/vo/BackflushRecordDetailbPageReqVO.java rename to win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/vo/BackflushRecordDetailbPageReqVO.java index 19ab2e76..bcf651b3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/backflushRecord/vo/BackflushRecordDetailbPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/vo/BackflushRecordDetailbPageReqVO.java @@ -1,10 +1,12 @@ -package com.win.module.wms.controller.backflushRecord.vo; +package com.win.module.wms.controller.productreceiptRecord.vo; -import lombok.*; -import java.util.*; -import io.swagger.v3.oas.annotations.media.Schema; import com.win.framework.common.pojo.PageParam; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; import org.springframework.format.annotation.DateTimeFormat; + import java.time.LocalDateTime; import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/backflushRecord/vo/BackflushRecordDetailbRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/vo/BackflushRecordDetailbRespVO.java similarity index 66% rename from win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/backflushRecord/vo/BackflushRecordDetailbRespVO.java rename to win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/vo/BackflushRecordDetailbRespVO.java index 0acbad4c..f43c7b1f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/backflushRecord/vo/BackflushRecordDetailbRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/vo/BackflushRecordDetailbRespVO.java @@ -1,7 +1,9 @@ -package com.win.module.wms.controller.backflushRecord.vo; +package com.win.module.wms.controller.productreceiptRecord.vo; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; @Schema(description = "管理后台 - 制品收货记录子 Response VO") @Data diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/backflushRecord/vo/BackflushRecordDetailbUpdateReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/vo/BackflushRecordDetailbUpdateReqVO.java similarity index 67% rename from win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/backflushRecord/vo/BackflushRecordDetailbUpdateReqVO.java rename to win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/vo/BackflushRecordDetailbUpdateReqVO.java index a7ccaf3d..081b70d7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/backflushRecord/vo/BackflushRecordDetailbUpdateReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/vo/BackflushRecordDetailbUpdateReqVO.java @@ -1,7 +1,9 @@ -package com.win.module.wms.controller.backflushRecord.vo; +package com.win.module.wms.controller.productreceiptRecord.vo; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; @Schema(description = "管理后台 - 制品收货记录子更新 Request VO") @Data diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/consumeRecord/ConsumeRecordDetailbController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/ConsumeRecordDetailbController.java similarity index 91% rename from win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/consumeRecord/ConsumeRecordDetailbController.java rename to win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/ConsumeRecordDetailbController.java index 261dd5f9..5db2c78e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/consumeRecord/ConsumeRecordDetailbController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/ConsumeRecordDetailbController.java @@ -1,35 +1,31 @@ -package com.win.module.wms.controller.consumeRecord; +package com.win.module.wms.controller.productrepairRecord; +import com.win.framework.common.pojo.CommonResult; +import com.win.framework.common.pojo.PageResult; +import com.win.framework.excel.core.util.ExcelUtils; +import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.configurationsetting.vo.ConfigurationsettingExcelVO; -import com.win.module.wms.controller.consumeRecord.vo.*; -import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; +import com.win.module.wms.controller.productrepairRecord.vo.*; +import com.win.module.wms.convert.productrepairRecord.ConsumeRecordDetailbConvert; +import com.win.module.wms.dal.dataobject.consumeRecord.ConsumeRecordDetailbDO; +import com.win.module.wms.service.productrepairRecord.ConsumeRecordDetailbService; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; -import javax.validation.*; -import javax.servlet.http.*; -import java.util.*; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; import java.io.IOException; +import java.util.Collection; +import java.util.List; -import com.win.framework.common.pojo.PageResult; -import com.win.framework.common.pojo.CommonResult; import static com.win.framework.common.pojo.CommonResult.success; - -import com.win.framework.excel.core.util.ExcelUtils; - -import com.win.framework.operatelog.core.annotations.OperateLog; -import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*; - -import com.win.module.wms.controller.consumeRecord.vo.*; -import com.win.module.wms.dal.dataobject.consumeRecord.ConsumeRecordDetailbDO; -import com.win.module.wms.convert.consumeRecord.ConsumeRecordDetailbConvert; -import com.win.module.wms.service.consumeRecord.ConsumeRecordDetailbService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 制品返修记录子") @RestController diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/consumeRecord/vo/ConsumeRecordDetailbBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/vo/ConsumeRecordDetailbBaseVO.java similarity index 93% rename from win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/consumeRecord/vo/ConsumeRecordDetailbBaseVO.java rename to win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/vo/ConsumeRecordDetailbBaseVO.java index 03cde55a..d046f166 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/consumeRecord/vo/ConsumeRecordDetailbBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/vo/ConsumeRecordDetailbBaseVO.java @@ -1,12 +1,11 @@ -package com.win.module.wms.controller.consumeRecord.vo; +package com.win.module.wms.controller.productrepairRecord.vo; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import java.util.*; -import java.time.LocalDateTime; -import javax.validation.constraints.*; +import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; + import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/consumeRecord/vo/ConsumeRecordDetailbCreateReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/vo/ConsumeRecordDetailbCreateReqVO.java similarity index 67% rename from win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/consumeRecord/vo/ConsumeRecordDetailbCreateReqVO.java rename to win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/vo/ConsumeRecordDetailbCreateReqVO.java index 2cec4037..dd69422b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/consumeRecord/vo/ConsumeRecordDetailbCreateReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/vo/ConsumeRecordDetailbCreateReqVO.java @@ -1,7 +1,9 @@ -package com.win.module.wms.controller.consumeRecord.vo; +package com.win.module.wms.controller.productrepairRecord.vo; -import lombok.*; import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; @Schema(description = "管理后台 - 制品返修记录子创建 Request VO") @Data diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/consumeRecord/vo/ConsumeRecordDetailbExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/vo/ConsumeRecordDetailbExcelVO.java similarity index 93% rename from win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/consumeRecord/vo/ConsumeRecordDetailbExcelVO.java rename to win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/vo/ConsumeRecordDetailbExcelVO.java index 2d5e2718..4f1f5406 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/consumeRecord/vo/ConsumeRecordDetailbExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/vo/ConsumeRecordDetailbExcelVO.java @@ -1,13 +1,11 @@ -package com.win.module.wms.controller.consumeRecord.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import java.util.*; -import java.time.LocalDateTime; +package com.win.module.wms.controller.productrepairRecord.vo; import com.alibaba.excel.annotation.ExcelProperty; import com.win.framework.excel.core.annotations.DictFormat; import com.win.framework.excel.core.convert.DictConvert; +import lombok.Data; + +import java.time.LocalDateTime; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/consumeRecord/vo/ConsumeRecordDetailbExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/vo/ConsumeRecordDetailbExportReqVO.java similarity index 92% rename from win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/consumeRecord/vo/ConsumeRecordDetailbExportReqVO.java rename to win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/vo/ConsumeRecordDetailbExportReqVO.java index 4c744dad..8ffdb470 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/consumeRecord/vo/ConsumeRecordDetailbExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/vo/ConsumeRecordDetailbExportReqVO.java @@ -1,12 +1,11 @@ -package com.win.module.wms.controller.consumeRecord.vo; +package com.win.module.wms.controller.productrepairRecord.vo; -import lombok.*; -import java.util.*; import io.swagger.v3.oas.annotations.media.Schema; -import com.win.framework.common.pojo.PageParam; -import java.time.LocalDateTime; +import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; + import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @Schema(description = "管理后台 - 制品返修记录子 Excel 导出 Request VO，参数和 ConsumeRecordDetailbPageReqVO 是一致的") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/consumeRecord/vo/ConsumeRecordDetailbPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/vo/ConsumeRecordDetailbPageReqVO.java similarity index 93% rename from win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/consumeRecord/vo/ConsumeRecordDetailbPageReqVO.java rename to win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/vo/ConsumeRecordDetailbPageReqVO.java index 52e85797..d9b4216a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/consumeRecord/vo/ConsumeRecordDetailbPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/vo/ConsumeRecordDetailbPageReqVO.java @@ -1,10 +1,12 @@ -package com.win.module.wms.controller.consumeRecord.vo; +package com.win.module.wms.controller.productrepairRecord.vo; -import lombok.*; -import java.util.*; -import io.swagger.v3.oas.annotations.media.Schema; import com.win.framework.common.pojo.PageParam; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; import org.springframework.format.annotation.DateTimeFormat; + import java.time.LocalDateTime; import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/consumeRecord/vo/ConsumeRecordDetailbRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/vo/ConsumeRecordDetailbRespVO.java similarity index 66% rename from win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/consumeRecord/vo/ConsumeRecordDetailbRespVO.java rename to win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/vo/ConsumeRecordDetailbRespVO.java index b0b40a2e..13377497 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/consumeRecord/vo/ConsumeRecordDetailbRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/vo/ConsumeRecordDetailbRespVO.java @@ -1,7 +1,9 @@ -package com.win.module.wms.controller.consumeRecord.vo; +package com.win.module.wms.controller.productrepairRecord.vo; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; @Schema(description = "管理后台 - 制品返修记录子 Response VO") @Data diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/consumeRecord/vo/ConsumeRecordDetailbUpdateReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/vo/ConsumeRecordDetailbUpdateReqVO.java similarity index 67% rename from win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/consumeRecord/vo/ConsumeRecordDetailbUpdateReqVO.java rename to win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/vo/ConsumeRecordDetailbUpdateReqVO.java index e326bc7c..2defa5d9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/consumeRecord/vo/ConsumeRecordDetailbUpdateReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/vo/ConsumeRecordDetailbUpdateReqVO.java @@ -1,7 +1,9 @@ -package com.win.module.wms.controller.consumeRecord.vo; +package com.win.module.wms.controller.productrepairRecord.vo; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; @Schema(description = "管理后台 - 制品返修记录子更新 Request VO") @Data diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/balance/BalanceConvert.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/balance/BalanceConvert.java index 82f5800b..95d7563d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/balance/BalanceConvert.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/balance/BalanceConvert.java @@ -4,10 +4,7 @@ import java.util.*; import com.win.framework.common.pojo.PageResult; -import com.win.module.wms.controller.balance.vo.BalanceCreateReqVO; -import com.win.module.wms.controller.balance.vo.BalanceExcelVO; -import com.win.module.wms.controller.balance.vo.BalanceRespVO; -import com.win.module.wms.controller.balance.vo.BalanceUpdateReqVO; +import com.win.module.wms.controller.balance.vo.*; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; import com.win.module.wms.dal.dataobject.balance.BalanceDO; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/backflushRecord/BackflushRecordDetailbConvert.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/productreceiptRecord/BackflushRecordDetailbConvert.java similarity index 61% rename from win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/backflushRecord/BackflushRecordDetailbConvert.java rename to win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/productreceiptRecord/BackflushRecordDetailbConvert.java index a72331f7..1a9fa819 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/backflushRecord/BackflushRecordDetailbConvert.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/productreceiptRecord/BackflushRecordDetailbConvert.java @@ -1,16 +1,15 @@ -package com.win.module.wms.convert.backflushRecord; - -import java.util.*; +package com.win.module.wms.convert.productreceiptRecord; import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.controller.backflushRecord.vo.BackflushRecordDetailbCreateReqVO; -import com.win.module.wms.controller.backflushRecord.vo.BackflushRecordDetailbExcelVO; -import com.win.module.wms.controller.backflushRecord.vo.BackflushRecordDetailbRespVO; -import com.win.module.wms.controller.backflushRecord.vo.BackflushRecordDetailbUpdateReqVO; +import com.win.module.wms.controller.productreceiptRecord.vo.BackflushRecordDetailbCreateReqVO; +import com.win.module.wms.controller.productreceiptRecord.vo.BackflushRecordDetailbExcelVO; +import com.win.module.wms.controller.productreceiptRecord.vo.BackflushRecordDetailbRespVO; +import com.win.module.wms.controller.productreceiptRecord.vo.BackflushRecordDetailbUpdateReqVO; +import com.win.module.wms.dal.dataobject.productreceiptRecord.BackflushRecordDetailbDO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; -import com.win.module.wms.dal.dataobject.backflushRecord.BackflushRecordDetailbDO; + +import java.util.List; /** * 制品收货记录子 Convert diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/consumeRecord/ConsumeRecordDetailbConvert.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/productrepairRecord/ConsumeRecordDetailbConvert.java similarity index 67% rename from win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/consumeRecord/ConsumeRecordDetailbConvert.java rename to win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/productrepairRecord/ConsumeRecordDetailbConvert.java index fa5872fa..a145d232 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/consumeRecord/ConsumeRecordDetailbConvert.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/productrepairRecord/ConsumeRecordDetailbConvert.java @@ -1,16 +1,15 @@ -package com.win.module.wms.convert.consumeRecord; - -import java.util.*; +package com.win.module.wms.convert.productrepairRecord; import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.controller.consumeRecord.vo.ConsumeRecordDetailbCreateReqVO; -import com.win.module.wms.controller.consumeRecord.vo.ConsumeRecordDetailbExcelVO; -import com.win.module.wms.controller.consumeRecord.vo.ConsumeRecordDetailbRespVO; -import com.win.module.wms.controller.consumeRecord.vo.ConsumeRecordDetailbUpdateReqVO; +import com.win.module.wms.controller.productrepairRecord.vo.ConsumeRecordDetailbCreateReqVO; +import com.win.module.wms.controller.productrepairRecord.vo.ConsumeRecordDetailbExcelVO; +import com.win.module.wms.controller.productrepairRecord.vo.ConsumeRecordDetailbRespVO; +import com.win.module.wms.controller.productrepairRecord.vo.ConsumeRecordDetailbUpdateReqVO; +import com.win.module.wms.dal.dataobject.consumeRecord.ConsumeRecordDetailbDO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; -import com.win.module.wms.dal.dataobject.consumeRecord.ConsumeRecordDetailbDO; + +import java.util.List; /** * 制品返修记录子 Convert diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/backflushRecord/BackflushRecordDetailbDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productreceiptRecord/BackflushRecordDetailbDO.java similarity index 88% rename from win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/backflushRecord/BackflushRecordDetailbDO.java rename to win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productreceiptRecord/BackflushRecordDetailbDO.java index 44ad0f04..aa75e9a1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/backflushRecord/BackflushRecordDetailbDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productreceiptRecord/BackflushRecordDetailbDO.java @@ -1,10 +1,11 @@ -package com.win.module.wms.dal.dataobject.backflushRecord; +package com.win.module.wms.dal.dataobject.productreceiptRecord; -import lombok.*; -import java.util.*; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.sun.xml.bind.v2.TODO; import com.win.framework.mybatis.core.dataobject.BaseDO; +import lombok.*; /** * 制品收货记录子 DO diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productrepairRecord/ConsumeRecordDetailbDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productrepairRecord/ConsumeRecordDetailbDO.java new file mode 100644 index 00000000..b7edf895 --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productrepairRecord/ConsumeRecordDetailbDO.java @@ -0,0 +1,107 @@ +package com.win.module.wms.dal.dataobject.productrepairRecord; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.sun.xml.bind.v2.TODO; +import com.win.framework.mybatis.core.dataobject.BaseDO; +import lombok.*; + +/** + * 制品返修记录子 DO + * + * @author 超级管理员 + */ +@TableName("record_consume_detailb") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class ConsumeRecordDetailbDO extends BaseDO { + + /** + * id + */ + @TableId + private Long id; + /** + * 批次 + */ + private String batch; + /** + * 从库位代码 + */ + private String fromLocationCode; + /** + * 从库位组代码 + */ + private String fromLocationGroupCode; + /** + * 从库区代码 + */ + private String fromAreaCode; + /** + * 库存状态 + * + * 枚举 {@link TODO inventory_status 对应的类} + */ + private String inventoryStatus; + /** + * 包装号 + */ + private String packingNumber; + /** + * 主表ID + */ + private String masterId; + /** + * 单据号 + */ + private String number; + /** + * 物品代码 + */ + private String itemCode; + /** + * 备注 + */ + private String remark; + /** + * 地点ID + */ + private String siteId; + /** + * 物品名称 + */ + private String itemName; + /** + * 物品描述1 + */ + private String itemDesc1; + /** + * 物品描述2 + */ + private String itemDesc2; + /** + * 项目代码 + */ + private String projectCode; + /** + * 计量单位 + * + * 枚举 {@link TODO uom 对应的类} + */ + private String uom; + /** + * 代码 + */ + private String code; + /** + * 接口类型 + * + * 枚举 {@link TODO interface_type 对应的类} + */ + private String interfaceType; + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/accountcalendar/AccountcalendarMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/accountcalendar/AccountcalendarMapper.java index 36b303d1..4c042438 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/accountcalendar/AccountcalendarMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/accountcalendar/AccountcalendarMapper.java @@ -1,11 +1,14 @@ package com.win.module.wms.dal.mysql.accountcalendar; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.mapper.BaseMapperX; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.accountcalendar.vo.AccountcalendarExportReqVO; import com.win.module.wms.controller.accountcalendar.vo.AccountcalendarPageReqVO; import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -38,7 +41,9 @@ public interface AccountcalendarMapper extends BaseMapperX { .eqIfPresent(AccountcalendarDO::getCreator, reqVO.getCreator()) .orderByDesc(AccountcalendarDO::getId)); } - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(AccountcalendarExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(AccountcalendarDO::getYear, reqVO.getYear()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/areabasic/AreabasicMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/areabasic/AreabasicMapper.java index a41ddc04..f3c7b84a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/areabasic/AreabasicMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/areabasic/AreabasicMapper.java @@ -1,8 +1,10 @@ package com.win.module.wms.dal.mysql.areabasic; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.mapper.BaseMapperX; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.areabasic.vo.AreabasicExportReqVO; import com.win.module.wms.controller.areabasic.vo.AreabasicPageReqVO; import com.win.module.wms.dal.dataobject.areabasic.AreabasicDO; @@ -38,7 +40,9 @@ public interface AreabasicMapper extends BaseMapperX { .eqIfPresent(AreabasicDO::getCreator, reqVO.getCreator()) .orderByDesc(AreabasicDO::getId)); } - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(AreabasicExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(AreabasicDO::getCode, reqVO.getCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/balance/BalanceMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/balance/BalanceMapper.java index d49da81e..175dc505 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/balance/BalanceMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/balance/BalanceMapper.java @@ -2,12 +2,15 @@ package com.win.module.wms.dal.mysql.balance; import java.util.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.balance.vo.BalanceExportReqVO; import com.win.module.wms.controller.balance.vo.BalancePageReqVO; import com.win.module.wms.dal.dataobject.balance.BalanceDO; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import org.apache.ibatis.annotations.Mapper; /** @@ -50,7 +53,9 @@ public interface BalanceMapper extends BaseMapperX { .eqIfPresent(BalanceDO::getVolume, reqVO.getVolume()) .orderByDesc(BalanceDO::getId)); } - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(BalanceExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(BalanceDO::getPackingNumber, reqVO.getPackingNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/barcode/BarcodeMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/barcode/BarcodeMapper.java index 38d180d2..6720146f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/barcode/BarcodeMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/barcode/BarcodeMapper.java @@ -1,11 +1,14 @@ package com.win.module.wms.dal.mysql.barcode; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.mapper.BaseMapperX; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.barcode.vo.BarcodeExportReqVO; import com.win.module.wms.controller.barcode.vo.BarcodePageReqVO; import com.win.module.wms.dal.dataobject.barcode.BarcodeDO; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -35,6 +38,9 @@ public interface BarcodeMapper extends BaseMapperX { .orderByDesc(BarcodeDO::getId)); } + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(BarcodeExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(BarcodeDO::getCode, reqVO.getCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/bom/BomMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/bom/BomMapper.java index f933c5e9..c1ba720a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/bom/BomMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/bom/BomMapper.java @@ -1,11 +1,14 @@ package com.win.module.wms.dal.mysql.bom; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.mapper.BaseMapperX; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.bom.vo.BomExportReqVO; import com.win.module.wms.controller.bom.vo.BomPageReqVO; import com.win.module.wms.dal.dataobject.bom.BomDO; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -39,7 +42,9 @@ public interface BomMapper extends BaseMapperX { .eqIfPresent(BomDO::getCreator, reqVO.getCreator()) .orderByDesc(BomDO::getId)); } - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(BomExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(BomDO::getProductItemCode, reqVO.getProductItemCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/businesstype/BusinesstypeMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/businesstype/BusinesstypeMapper.java index fd6c1c32..faba0d8e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/businesstype/BusinesstypeMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/businesstype/BusinesstypeMapper.java @@ -1,11 +1,14 @@ package com.win.module.wms.dal.mysql.businesstype; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.mapper.BaseMapperX; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.businesstype.vo.BusinesstypeExportReqVO; import com.win.module.wms.controller.businesstype.vo.BusinesstypePageReqVO; import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -47,7 +50,9 @@ public interface BusinesstypeMapper extends BaseMapperX { .eqIfPresent(BusinesstypeDO::getIsSoftDeleted, reqVO.getIsSoftDeleted()) .orderByDesc(BusinesstypeDO::getId)); } - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(BusinesstypeExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(BusinesstypeDO::getCode, reqVO.getCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/carrier/CarrierMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/carrier/CarrierMapper.java index 17f195a7..793a99df 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/carrier/CarrierMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/carrier/CarrierMapper.java @@ -1,10 +1,13 @@ package com.win.module.wms.dal.mysql.carrier; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.mapper.BaseMapperX; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.carrier.vo.CarrierExportReqVO; import com.win.module.wms.controller.carrier.vo.CarrierPageReqVO; +import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO; import com.win.module.wms.dal.dataobject.carrier.CarrierDO; import org.apache.ibatis.annotations.Mapper; @@ -42,7 +45,9 @@ public interface CarrierMapper extends BaseMapperX { .eqIfPresent(CarrierDO::getAvailable, reqVO.getAvailable()) .orderByDesc(CarrierDO::getId)); } - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(CarrierExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(CarrierDO::getCode, reqVO.getCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/condition/ConditionMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/condition/ConditionMapper.java index 1ca6d3e1..039b63aa 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/condition/ConditionMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/condition/ConditionMapper.java @@ -2,11 +2,14 @@ package com.win.module.wms.dal.mysql.condition; import java.util.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.condition.vo.ConditionExportReqVO; import com.win.module.wms.controller.condition.vo.ConditionPageReqVO; +import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO; import com.win.module.wms.dal.dataobject.condition.ConditionDO; import org.apache.ibatis.annotations.Mapper; @@ -28,7 +31,9 @@ public interface ConditionMapper extends BaseMapperX { .eqIfPresent(ConditionDO::getGroupCode, reqVO.getGroupCode()) .orderByDesc(ConditionDO::getId)); } - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(ConditionExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ConditionDO::getStrategyCode, reqVO.getStrategyCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/configuration/ConfigurationMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/configuration/ConfigurationMapper.java index 011e80db..f38eebda 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/configuration/ConfigurationMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/configuration/ConfigurationMapper.java @@ -2,11 +2,14 @@ package com.win.module.wms.dal.mysql.configuration; import java.util.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.configuration.vo.ConfigurationExportReqVO; import com.win.module.wms.controller.configuration.vo.ConfigurationPageReqVO; +import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO; import com.win.module.wms.dal.dataobject.configuration.ConfigurationDO; import org.apache.ibatis.annotations.Mapper; @@ -28,7 +31,9 @@ public interface ConfigurationMapper extends BaseMapperX { .eqIfPresent(ConfigurationDO::getGroupCode, reqVO.getGroupCode()) .orderByDesc(ConfigurationDO::getId)); } - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(ConfigurationExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ConfigurationDO::getStrategyCode, reqVO.getStrategyCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/configurationsetting/ConfigurationsettingMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/configurationsetting/ConfigurationsettingMapper.java index 3588be06..de28d403 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/configurationsetting/ConfigurationsettingMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/configurationsetting/ConfigurationsettingMapper.java @@ -2,11 +2,14 @@ package com.win.module.wms.dal.mysql.configurationsetting; import java.util.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.configurationsetting.vo.ConfigurationsettingExportReqVO; import com.win.module.wms.controller.configurationsetting.vo.ConfigurationsettingPageReqVO; +import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO; import com.win.module.wms.dal.dataobject.configurationsetting.ConfigurationsettingDO; import org.apache.ibatis.annotations.Mapper; @@ -30,7 +33,9 @@ public interface ConfigurationsettingMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(ConfigurationsettingExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ConfigurationsettingDO::getStrategyType, reqVO.getStrategyType()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/backflushRecord/BackflushRecordDetailbMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productreceiptRecord/BackflushRecordDetailbMapper.java similarity index 93% rename from win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/backflushRecord/BackflushRecordDetailbMapper.java rename to win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productreceiptRecord/BackflushRecordDetailbMapper.java index 9b4d9184..73105a41 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/backflushRecord/BackflushRecordDetailbMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productreceiptRecord/BackflushRecordDetailbMapper.java @@ -1,15 +1,15 @@ -package com.win.module.wms.dal.mysql.backflushRecord; - -import java.util.*; +package com.win.module.wms.dal.mysql.productreceiptRecord; import com.win.framework.common.pojo.PageResult; -import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; -import com.win.module.wms.controller.backflushRecord.vo.BackflushRecordDetailbExportReqVO; -import com.win.module.wms.controller.backflushRecord.vo.BackflushRecordDetailbPageReqVO; -import com.win.module.wms.dal.dataobject.backflushRecord.BackflushRecordDetailbDO; +import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; +import com.win.module.wms.controller.productreceiptRecord.vo.BackflushRecordDetailbExportReqVO; +import com.win.module.wms.controller.productreceiptRecord.vo.BackflushRecordDetailbPageReqVO; +import com.win.module.wms.dal.dataobject.productreceiptRecord.BackflushRecordDetailbDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 制品收货记录子 Mapper * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/consumeRecord/ConsumeRecordDetailbMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productrepairRecord/ConsumeRecordDetailbMapper.java similarity index 94% rename from win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/consumeRecord/ConsumeRecordDetailbMapper.java rename to win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productrepairRecord/ConsumeRecordDetailbMapper.java index cb249c31..6f474620 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/consumeRecord/ConsumeRecordDetailbMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productrepairRecord/ConsumeRecordDetailbMapper.java @@ -1,15 +1,15 @@ -package com.win.module.wms.dal.mysql.consumeRecord; - -import java.util.*; +package com.win.module.wms.dal.mysql.productrepairRecord; import com.win.framework.common.pojo.PageResult; -import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; -import com.win.module.wms.controller.consumeRecord.vo.ConsumeRecordDetailbExportReqVO; -import com.win.module.wms.controller.consumeRecord.vo.ConsumeRecordDetailbPageReqVO; +import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; +import com.win.module.wms.controller.productrepairRecord.vo.ConsumeRecordDetailbExportReqVO; +import com.win.module.wms.controller.productrepairRecord.vo.ConsumeRecordDetailbPageReqVO; import com.win.module.wms.dal.dataobject.consumeRecord.ConsumeRecordDetailbDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 制品返修记录子 Mapper * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/accountcalendar/AccountcalendarService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/accountcalendar/AccountcalendarService.java index 1f4ecd80..7613546a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/accountcalendar/AccountcalendarService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/accountcalendar/AccountcalendarService.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.accountcalendar; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.accountcalendar.vo.*; import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; @@ -61,6 +62,13 @@ public interface AccountcalendarService { */ PageResult getAccountcalendarPage(AccountcalendarPageReqVO pageReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getAccountcalendarSenior(CustomConditions conditions); /** * 获得账期日历列表, 用于 Excel 导出 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/accountcalendar/AccountcalendarServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/accountcalendar/AccountcalendarServiceImpl.java index 88a8531b..8c043fe5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/accountcalendar/AccountcalendarServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/accountcalendar/AccountcalendarServiceImpl.java @@ -1,8 +1,10 @@ package com.win.module.wms.service.accountcalendar; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; import com.google.common.annotations.VisibleForTesting; import com.win.framework.common.exception.ServiceException; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.datapermission.core.util.DataPermissionUtils; import com.win.module.wms.controller.accountcalendar.vo.*; @@ -77,6 +79,10 @@ public class AccountcalendarServiceImpl implements AccountcalendarService { return accountcalendarMapper.selectPage(pageReqVO); } + @Override + public PageResult getAccountcalendarSenior(CustomConditions conditions) { + return accountcalendarMapper.selectSenior(conditions); + } @Override public List getAccountcalendarList(AccountcalendarExportReqVO exportReqVO) { return accountcalendarMapper.selectList(exportReqVO); @@ -88,24 +94,35 @@ public class AccountcalendarServiceImpl implements AccountcalendarService { } List errorList = new ArrayList<>(); importAccountcalendars.forEach(importAccountcalendar -> { + String massage = ""; // 校验，判断是否有不符合的原因 - try { - if(mode != null){ - validateAccountcalendarForCreateOrUpdate(null,importAccountcalendar.getAvailable()); + if(mode != null){ + try { + validateAccountcalendarExists(null); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateAvailableExists(importAccountcalendar.getAvailable()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; } - } catch (ServiceException ex) { - errorList.add(importAccountcalendar); - return; } - // 判断如果不存在，在进行插入 - AccountcalendarDO existAccountcalendar = new AccountcalendarDO(); - if (existAccountcalendar == null&& mode != 3) { - accountcalendarMapper.insert(AccountcalendarConvert.INSTANCE.convert(importAccountcalendar)); + if(StrUtil.isNotEmpty(massage)){ + massage.substring(0,massage.length()-1); + errorList.add(importAccountcalendar); } - else if (existAccountcalendar != null && mode != 2) {// 如果存在，判断是否允许更新 - AccountcalendarDO accountcalendarDO = AccountcalendarConvert.INSTANCE.convert(importAccountcalendar); - accountcalendarDO.setId(existAccountcalendar.getId()); - accountcalendarMapper.updateById(accountcalendarDO); + if(errorList == null){ + // 判断如果不存在，在进行插入 + AccountcalendarDO existAccountcalendar = new AccountcalendarDO(); + if (existAccountcalendar == null&& mode != 3) { + accountcalendarMapper.insert(AccountcalendarConvert.INSTANCE.convert(importAccountcalendar)); + } + else if (existAccountcalendar != null && mode != 2) {// 如果存在，判断是否允许更新 + AccountcalendarDO accountcalendarDO = AccountcalendarConvert.INSTANCE.convert(importAccountcalendar); + accountcalendarDO.setId(existAccountcalendar.getId()); + accountcalendarMapper.updateById(accountcalendarDO); + } } }); //错误不为空并非部分更新，手工回滚 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/areabasic/AreabasicService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/areabasic/AreabasicService.java index 815521f4..3f14fc6c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/areabasic/AreabasicService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/areabasic/AreabasicService.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.areabasic; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.areabasic.vo.*; import com.win.module.wms.dal.dataobject.areabasic.AreabasicDO; @@ -60,7 +61,13 @@ public interface AreabasicService { * @return 库区分页 */ PageResult getAreabasicPage(AreabasicPageReqVO pageReqVO); - + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getAreabasicSenior(CustomConditions conditions); /** * 获得库区列表, 用于 Excel 导出 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/areabasic/AreabasicServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/areabasic/AreabasicServiceImpl.java index 7248243d..96cde880 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/areabasic/AreabasicServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/areabasic/AreabasicServiceImpl.java @@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.google.common.annotations.VisibleForTesting; import com.win.framework.common.exception.ServiceException; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.datapermission.core.util.DataPermissionUtils; import com.win.module.wms.controller.areabasic.vo.*; @@ -75,7 +76,10 @@ public class AreabasicServiceImpl implements AreabasicService { public PageResult getAreabasicPage(AreabasicPageReqVO pageReqVO) { return areabasicMapper.selectPage(pageReqVO); } - + @Override + public PageResult getAreabasicSenior(CustomConditions conditions) { + return areabasicMapper.selectSenior(conditions); + } @Override public List getAreabasicList(AreabasicExportReqVO exportReqVO) { return areabasicMapper.selectList(exportReqVO); @@ -88,14 +92,38 @@ public class AreabasicServiceImpl implements AreabasicService { } List errorList = new ArrayList<>(); areabasics.forEach(areabasic -> { + String massage = ""; // 校验，判断是否有不符合的原因 - try { - if(mode == 2){ - validateAreabasicForCreateOrUpdate(null,areabasic.getCode(),areabasic.getWarehouseCode(),areabasic.getIsFunctional(),areabasic.getAvailable()); + if(mode == 2){ + try { + validateAreabasicExists(null); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateCodeExists(null,areabasic.getCode()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; } - } catch (ServiceException ex) { + try { + validateWarehouseCodeExists(areabasic.getWarehouseCode()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateIsFunctionalExists(areabasic.getIsFunctional()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateAvailableExists(areabasic.getAvailable()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + } + if(StrUtil.isNotEmpty(massage)){ + massage.substring(0,massage.length()-1); errorList.add(areabasic); - return; } // 判断如果不存在，在进行插入 AreabasicDO existAccountcalendar = areabasicMapper.selectByCode(areabasic.getCode()); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/balance/BalanceService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/balance/BalanceService.java index 7490673f..777cfd59 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/balance/BalanceService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/balance/BalanceService.java @@ -3,12 +3,12 @@ package com.win.module.wms.service.balance; import java.util.*; import javax.validation.*; -import com.win.module.wms.controller.balance.vo.BalanceCreateReqVO; -import com.win.module.wms.controller.balance.vo.BalanceExportReqVO; -import com.win.module.wms.controller.balance.vo.BalancePageReqVO; -import com.win.module.wms.controller.balance.vo.BalanceUpdateReqVO; +import com.win.framework.common.pojo.CustomConditions; +import com.win.module.wms.controller.balance.vo.*; +import com.win.module.wms.controller.itembasic.vo.ItembasicImportExcelVo; import com.win.module.wms.dal.dataobject.balance.BalanceDO; import com.win.framework.common.pojo.PageResult; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; /** * 库存余额 Service 接口 @@ -63,6 +63,14 @@ public interface BalanceService { */ PageResult getBalancePage(BalancePageReqVO pageReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getBalanceSenior(CustomConditions conditions); + /** * 获得库存余额列表, 用于 Excel 导出 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/balance/BalanceServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/balance/BalanceServiceImpl.java index ba09d52c..c89893f9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/balance/BalanceServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/balance/BalanceServiceImpl.java @@ -1,16 +1,20 @@ package com.win.module.wms.service.balance; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.exceptions.UtilException; +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.ErrorCode; -import com.win.module.wms.controller.balance.vo.BalanceCreateReqVO; -import com.win.module.wms.controller.balance.vo.BalanceExportReqVO; -import com.win.module.wms.controller.balance.vo.BalancePageReqVO; -import com.win.module.wms.controller.balance.vo.BalanceUpdateReqVO; +import com.win.framework.common.exception.ServiceException; +import com.win.framework.common.pojo.CustomConditions; +import com.win.module.wms.controller.balance.vo.*; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import org.springframework.transaction.interceptor.TransactionAspectSupport; import org.springframework.validation.annotation.Validated; import java.util.*; @@ -86,6 +90,11 @@ public class BalanceServiceImpl implements BalanceService { return balanceMapper.selectPage(pageReqVO); } + @Override + public PageResult getBalanceSenior(CustomConditions conditions) { + return balanceMapper.selectSenior(conditions); + } + @Override public List getBalanceList(BalanceExportReqVO exportReqVO) { return balanceMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/barcode/BarcodeService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/barcode/BarcodeService.java index 55847e42..d8eda171 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/barcode/BarcodeService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/barcode/BarcodeService.java @@ -1,8 +1,10 @@ package com.win.module.wms.service.barcode; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.barcode.vo.*; import com.win.module.wms.dal.dataobject.barcode.BarcodeDO; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import javax.validation.Valid; import java.util.Collection; @@ -60,6 +62,13 @@ public interface BarcodeService { * @return 条码片段分页 */ PageResult getBarcodePage(BarcodePageReqVO pageReqVO); + /** + * 获得用高级搜索条码片段分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getBarcodeSenior(CustomConditions conditions); /** * 获得条码片段列表, 用于 Excel 导出 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/barcode/BarcodeServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/barcode/BarcodeServiceImpl.java index 80ca29a3..6576f562 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/barcode/BarcodeServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/barcode/BarcodeServiceImpl.java @@ -4,11 +4,13 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.google.common.annotations.VisibleForTesting; import com.win.framework.common.exception.ServiceException; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.datapermission.core.util.DataPermissionUtils; import com.win.module.wms.controller.barcode.vo.*; import com.win.module.wms.convert.barcode.BarcodeConvert; import com.win.module.wms.dal.dataobject.barcode.BarcodeDO; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import com.win.module.wms.dal.mysql.barcode.BarcodeMapper; import org.springframework.stereotype.Service; import org.springframework.transaction.interceptor.TransactionAspectSupport; @@ -79,6 +81,10 @@ public class BarcodeServiceImpl implements BarcodeService { return barcodeMapper.selectPage(pageReqVO); } + @Override + public PageResult getBarcodeSenior(CustomConditions conditions) { + return barcodeMapper.selectSenior(conditions); + } @Override public List getBarcodeList(BarcodeExportReqVO exportReqVO) { return barcodeMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/bom/BomService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/bom/BomService.java index 3536e18e..b745196b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/bom/BomService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/bom/BomService.java @@ -1,8 +1,10 @@ package com.win.module.wms.service.bom; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.bom.vo.*; import com.win.module.wms.dal.dataobject.bom.BomDO; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import javax.validation.Valid; import java.util.Collection; @@ -60,7 +62,13 @@ public interface BomService { * @return 物料清单分页 */ PageResult getBomPage(BomPageReqVO pageReqVO); - + /** + * 获得用高级搜索物品清单分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getBomSenior(CustomConditions conditions); /** * 获得物料清单列表, 用于 Excel 导出 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/bom/BomServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/bom/BomServiceImpl.java index dd714cfa..a7cbd781 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/bom/BomServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/bom/BomServiceImpl.java @@ -4,11 +4,13 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.google.common.annotations.VisibleForTesting; import com.win.framework.common.exception.ServiceException; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.datapermission.core.util.DataPermissionUtils; import com.win.module.wms.controller.bom.vo.*; import com.win.module.wms.convert.bom.BomConvert; import com.win.module.wms.dal.dataobject.bom.BomDO; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import com.win.module.wms.dal.mysql.bom.BomMapper; import org.springframework.stereotype.Service; import org.springframework.transaction.interceptor.TransactionAspectSupport; @@ -79,7 +81,10 @@ public class BomServiceImpl implements BomService { public PageResult getBomPage(BomPageReqVO pageReqVO) { return bomMapper.selectPage(pageReqVO); } - + @Override + public PageResult getBomSenior(CustomConditions conditions) { + return bomMapper.selectSenior(conditions); + } @Override public List getBomList(BomExportReqVO exportReqVO) { return bomMapper.selectList(exportReqVO); @@ -92,24 +97,60 @@ public class BomServiceImpl implements BomService { } List errorList = new ArrayList<>(); boms.forEach(bom -> { - // 校验，判断是否有不符合的原因 - try { - if(mode == 2){ - validateBomForCreateOrUpdate(null,bom.getProductItemCode(),bom.getComponentItemCode(),bom.getComponentUom(),bom.getComponentQty(),bom.getProcessCode(),bom.getAvailable()); + String massage = ""; + if(mode == 2){ + try { + validateBomExists(null); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateProductItemCodeExists(null,bom.getProductItemCode()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateComponentUomExists(bom.getComponentUom()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateAvailableExists(bom.getAvailable()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateComponentItemCodeExists(bom.getComponentItemCode()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateComponentQtyExists(bom.getComponentQty()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateProcessCodeExists(bom.getProcessCode()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + + if(StrUtil.isNotEmpty(massage)){ + massage.substring(0,massage.length()-1); + errorList.add(bom); + } + if(errorList == null){ + // 判断如果不存在，在进行插入 + BomDO existAccountcalendar = bomMapper.selectByProductItemCode(bom.getProductItemCode()); + if (existAccountcalendar == null&& mode != 3) { + bomMapper.insert(BomConvert.INSTANCE.convert(bom)); + } + else if (existAccountcalendar != null && mode != 2) {// 如果存在，判断是否允许更新 + BomDO bomDO = BomConvert.INSTANCE.convert(bom); + bomDO.setId(existAccountcalendar.getId()); + bomMapper.updateById(bomDO); + } } - } catch (ServiceException ex) { - errorList.add(bom); - return; - } - // 判断如果不存在，在进行插入 - BomDO existAccountcalendar = bomMapper.selectByProductItemCode(bom.getProductItemCode()); - if (existAccountcalendar == null&& mode != 3) { - bomMapper.insert(BomConvert.INSTANCE.convert(bom)); - } - else if (existAccountcalendar != null && mode != 2) {// 如果存在，判断是否允许更新 - BomDO bomDO = BomConvert.INSTANCE.convert(bom); - bomDO.setId(existAccountcalendar.getId()); - bomMapper.updateById(bomDO); } }); //错误不为空并非部分更新，手工回滚 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/businesstype/BusinesstypeService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/businesstype/BusinesstypeService.java index 0b09598b..c5af78d6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/businesstype/BusinesstypeService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/businesstype/BusinesstypeService.java @@ -1,8 +1,10 @@ package com.win.module.wms.service.businesstype; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.businesstype.vo.*; import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import javax.validation.Valid; import java.util.Collection; @@ -60,6 +62,13 @@ public interface BusinesstypeService { * @return 业务类型分页 */ PageResult getBusinesstypePage(BusinesstypePageReqVO pageReqVO); + /** + * 获得用高级搜索业务类型分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getBusinesstypeSenior(CustomConditions conditions); /** * 获得业务类型列表, 用于 Excel 导出 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/businesstype/BusinesstypeServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/businesstype/BusinesstypeServiceImpl.java index 8babe7e9..170c006c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/businesstype/BusinesstypeServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/businesstype/BusinesstypeServiceImpl.java @@ -5,11 +5,13 @@ 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.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.datapermission.core.util.DataPermissionUtils; import com.win.module.wms.controller.businesstype.vo.*; import com.win.module.wms.convert.businesstype.BusinesstypeConvert; import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import com.win.module.wms.dal.mysql.businesstype.BusinesstypeMapper; import org.springframework.stereotype.Service; import org.springframework.transaction.interceptor.TransactionAspectSupport; @@ -82,6 +84,10 @@ public class BusinesstypeServiceImpl implements BusinesstypeService { return businesstypeMapper.selectPage(pageReqVO); } + @Override + public PageResult getBusinesstypeSenior(CustomConditions conditions) { + return businesstypeMapper.selectSenior(conditions); + } @Override public List getBusinesstypeList(BusinesstypeExportReqVO exportReqVO) { return businesstypeMapper.selectList(exportReqVO); @@ -94,26 +100,70 @@ public class BusinesstypeServiceImpl implements BusinesstypeService { } List errorList = new ArrayList<>(); businesstypes.forEach(businesstype -> { + String massage = ""; // 校验，判断是否有不符合的原因 - try { - if(mode == 2){ - validateBusinesstypeForCreateOrUpdate(null,businesstype.getCode(),businesstype.getName() - ,businesstype.getItemTypes(),businesstype.getItemStatuses(),businesstype.getOutTransactionType() - ,businesstype.getInTransactionType(),businesstype.getOnTheWayArea(),businesstype.getAvailable()); + if(mode != null){ + try { + validateBusinesstypeExists(null); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateCodeExists(null,businesstype.getCode()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateNameExists(businesstype.getName()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateItemTypesExists(businesstype.getItemTypes()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateItemStatusesExists(businesstype.getItemStatuses()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateOutTransactionTypeExists(businesstype.getOutTransactionType()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateInTransactionTypeExists(businesstype.getInTransactionType()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateOnTheWayAreaExists(businesstype.getOnTheWayArea()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateAvailableExists(businesstype.getAvailable()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + if(StrUtil.isNotEmpty(massage)){ + massage.substring(0,massage.length()-1); + errorList.add(businesstype); + } + if(errorList == null){ + // 判断如果不存在，在进行插入 + BusinesstypeDO existAccountcalendar = businesstypeMapper.selectByCode(businesstype.getCode()); + if (existAccountcalendar == null&& mode != 3) { + businesstypeMapper.insert(BusinesstypeConvert.INSTANCE.convert(businesstype)); + } + else if (existAccountcalendar != null && mode != 2) {// 如果存在，判断是否允许更新 + BusinesstypeDO businesstypeDO = BusinesstypeConvert.INSTANCE.convert(businesstype); + businesstypeDO.setId(existAccountcalendar.getId()); + businesstypeMapper.updateById(businesstypeDO); + } } - } catch (ServiceException ex) { - errorList.add(businesstype); - return; - } - // 判断如果不存在，在进行插入 - BusinesstypeDO existAccountcalendar = businesstypeMapper.selectByCode(businesstype.getCode()); - if (existAccountcalendar == null&& mode != 3) { - businesstypeMapper.insert(BusinesstypeConvert.INSTANCE.convert(businesstype)); - } - else if (existAccountcalendar != null && mode != 2) {// 如果存在，判断是否允许更新 - BusinesstypeDO businesstypeDO = BusinesstypeConvert.INSTANCE.convert(businesstype); - businesstypeDO.setId(existAccountcalendar.getId()); - businesstypeMapper.updateById(businesstypeDO); } }); //错误不为空并非部分更新，手工回滚 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/carrier/CarrierService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/carrier/CarrierService.java index e2614c32..bf79ef50 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/carrier/CarrierService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/carrier/CarrierService.java @@ -1,7 +1,9 @@ package com.win.module.wms.service.carrier; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.carrier.vo.*; +import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO; import com.win.module.wms.dal.dataobject.carrier.CarrierDO; import javax.validation.Valid; @@ -60,6 +62,13 @@ public interface CarrierService { * @return 承运商分页 */ PageResult getCarrierPage(CarrierPageReqVO pageReqVO); + /** + * 获得用高级搜索业务类型分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getCarrierSenior(CustomConditions conditions); /** * 获得承运商列表, 用于 Excel 导出 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/carrier/CarrierServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/carrier/CarrierServiceImpl.java index 801d624c..03003f3f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/carrier/CarrierServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/carrier/CarrierServiceImpl.java @@ -4,10 +4,12 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.google.common.annotations.VisibleForTesting; import com.win.framework.common.exception.ServiceException; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.datapermission.core.util.DataPermissionUtils; import com.win.module.wms.controller.carrier.vo.*; import com.win.module.wms.convert.carrier.CarrierConvert; +import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO; import com.win.module.wms.dal.dataobject.carrier.CarrierDO; import com.win.module.wms.dal.mysql.carrier.CarrierMapper; import org.springframework.stereotype.Service; @@ -77,7 +79,10 @@ public class CarrierServiceImpl implements CarrierService { public PageResult getCarrierPage(CarrierPageReqVO pageReqVO) { return carrierMapper.selectPage(pageReqVO); } - + @Override + public PageResult getCarrierSenior(CustomConditions conditions) { + return carrierMapper.selectSenior(conditions); + } @Override public List getCarrierList(CarrierExportReqVO exportReqVO) { return carrierMapper.selectList(exportReqVO); @@ -90,24 +95,45 @@ public class CarrierServiceImpl implements CarrierService { } List errorList = new ArrayList<>(); carriers.forEach(carrier -> { + String massage = ""; // 校验，判断是否有不符合的原因 - try { - if(mode == 2){ - validateCarrierForCreateOrUpdate(null,carrier.getCode(),carrier.getShortName(),carrier.getAvailable()); + if(mode == 2){ + try { + validateCarrierExists(null); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateCodeExists(null,carrier.getCode()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateShortNameExists(carrier.getShortName()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateAvailableExists(carrier.getAvailable()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + if(StrUtil.isNotEmpty(massage)){ + massage.substring(0,massage.length()-1); + errorList.add(carrier); + } + if(errorList == null){ + // 判断如果不存在，在进行插入 + CarrierDO existAccountcalendar = carrierMapper.selectByCode(carrier.getCode()); + if (existAccountcalendar == null&& mode != 3) { + carrierMapper.insert(CarrierConvert.INSTANCE.convert(carrier)); + } + else if (existAccountcalendar != null && mode != 2) {// 如果存在，判断是否允许更新 + CarrierDO carrierDo = CarrierConvert.INSTANCE.convert(carrier); + carrierDo.setId(existAccountcalendar.getId()); + carrierMapper.updateById(carrierDo); + } } - } catch (ServiceException ex) { - errorList.add(carrier); - return; - } - // 判断如果不存在，在进行插入 - CarrierDO existAccountcalendar = carrierMapper.selectByCode(carrier.getCode()); - if (existAccountcalendar == null&& mode != 3) { - carrierMapper.insert(CarrierConvert.INSTANCE.convert(carrier)); - } - else if (existAccountcalendar != null && mode != 2) {// 如果存在，判断是否允许更新 - CarrierDO carrierDo = CarrierConvert.INSTANCE.convert(carrier); - carrierDo.setId(existAccountcalendar.getId()); - carrierMapper.updateById(carrierDo); } }); //错误不为空并非部分更新，手工回滚 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/condition/ConditionService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/condition/ConditionService.java index ea3263a9..7637216c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/condition/ConditionService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/condition/ConditionService.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.condition; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.condition.vo.*; import com.win.module.wms.dal.dataobject.condition.ConditionDO; @@ -60,6 +61,14 @@ public interface ConditionService { * @return 条件分页 */ PageResult getConditionPage(ConditionPageReqVO pageReqVO); + /** + * 获得用高级搜索工位分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getConditionSenior(CustomConditions conditions); + /** * 获得条件列表, 用于 Excel 导出 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/condition/ConditionServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/condition/ConditionServiceImpl.java index fe4f4141..1cadb692 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/condition/ConditionServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/condition/ConditionServiceImpl.java @@ -1,8 +1,10 @@ package com.win.module.wms.service.condition; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; import com.google.common.annotations.VisibleForTesting; import com.win.framework.common.exception.ServiceException; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.datapermission.core.util.DataPermissionUtils; import com.win.module.wms.controller.condition.vo.*; @@ -82,7 +84,10 @@ public class ConditionServiceImpl implements ConditionService { public List getConditionList(ConditionExportReqVO exportReqVO) { return conditionMapper.selectList(exportReqVO); } - + @Override + public PageResult getConditionSenior(CustomConditions conditions) { + return conditionMapper.selectSenior(conditions); + } @Override @Transactional(rollbackFor = Exception.class) // 添加事务，异常则回滚所有导入 public List importConditionList(List conditions, Integer mode, Boolean updatePart) { @@ -91,24 +96,53 @@ public class ConditionServiceImpl implements ConditionService { } List errorList = new ArrayList<>(); conditions.forEach(condition -> { + String massage = ""; // 校验，判断是否有不符合的原因 - try { - if(mode != null){ - validateConditionForCreateOrUpdate(null,condition.getStrategyCode(),condition.getRuleCode(),condition.getParamCode(),condition.getOperator(),condition.getValue());} - } - catch (ServiceException ex) { - errorList.add(condition); - return; - } - // 判断如果不存在，在进行插入 - ConditionDO existAccountcalendar = null; - if (existAccountcalendar == null&& mode != 3) { - conditionMapper.insert(ConditionConvert.INSTANCE.convert(condition)); - } - else if (existAccountcalendar != null && mode != 2) {// 如果存在，判断是否允许更新 - ConditionDO conditionDo = ConditionConvert.INSTANCE.convert(condition); - conditionDo.setId(existAccountcalendar.getId()); - conditionMapper.updateById(conditionDo); + if(mode != null){ + try { + validateConditionExists(null); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateStrategyCodeExists(condition.getStrategyCode()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateRuleCodeExists(condition.getRuleCode()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateParamCodeExists(condition.getParamCode()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateOperatorExists(condition.getOperator()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } try { + validateValueExists(condition.getValue()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + }if(StrUtil.isNotEmpty(massage)){ + massage.substring(0,massage.length()-1); + errorList.add(condition); + } + if(errorList == null){ + // 判断如果不存在，在进行插入 + ConditionDO existAccountcalendar = null; + if (existAccountcalendar == null&& mode != 3) { + conditionMapper.insert(ConditionConvert.INSTANCE.convert(condition)); + } + else if (existAccountcalendar != null && mode != 2) {// 如果存在，判断是否允许更新 + ConditionDO conditionDo = ConditionConvert.INSTANCE.convert(condition); + conditionDo.setId(existAccountcalendar.getId()); + conditionMapper.updateById(conditionDo); + } + } } }); //错误不为空并非部分更新，手工回滚 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/configuration/ConfigurationService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/configuration/ConfigurationService.java index 05e6c701..0f0bef94 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/configuration/ConfigurationService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/configuration/ConfigurationService.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.configuration; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.configuration.vo.*; import com.win.module.wms.dal.dataobject.configuration.ConfigurationDO; @@ -60,6 +61,13 @@ public interface ConfigurationService { * @return 配置分页 */ PageResult getConfigurationPage(ConfigurationPageReqVO pageReqVO); + /** + * 获得用高级搜索配置分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getConfigurationSenior(CustomConditions conditions); /** * 获得配置列表, 用于 Excel 导出 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/configuration/ConfigurationServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/configuration/ConfigurationServiceImpl.java index e120ea59..a0cfa7d8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/configuration/ConfigurationServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/configuration/ConfigurationServiceImpl.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.configuration; import cn.hutool.core.collection.CollUtil; import com.google.common.annotations.VisibleForTesting; import com.win.framework.common.exception.ServiceException; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.datapermission.core.util.DataPermissionUtils; import com.win.module.wms.controller.configuration.vo.*; @@ -77,7 +78,10 @@ public class ConfigurationServiceImpl implements ConfigurationService { public PageResult getConfigurationPage(ConfigurationPageReqVO pageReqVO) { return configurationMapper.selectPage(pageReqVO); } - + @Override + public PageResult getConfigurationSenior(CustomConditions conditions) { + return configurationMapper.selectSenior(conditions); + } @Override public List getConfigurationList(ConfigurationExportReqVO exportReqVO) { return configurationMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/configurationsetting/ConfigurationsettingService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/configurationsetting/ConfigurationsettingService.java index 09df72ab..6624c06b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/configurationsetting/ConfigurationsettingService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/configurationsetting/ConfigurationsettingService.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.configurationsetting; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.configurationsetting.vo.*; import com.win.module.wms.dal.dataobject.configurationsetting.ConfigurationsettingDO; @@ -60,6 +61,13 @@ public interface ConfigurationsettingService { * @return 配置设置分页 */ PageResult getConfigurationsettingPage(ConfigurationsettingPageReqVO pageReqVO); + /** + * 获得用高级搜索配置设置分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getConfigurationsettingSenior(CustomConditions conditions); /** * 获得配置设置列表, 用于 Excel 导出 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/configurationsetting/ConfigurationsettingServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/configurationsetting/ConfigurationsettingServiceImpl.java index 177d809b..d20edfd9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/configurationsetting/ConfigurationsettingServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/configurationsetting/ConfigurationsettingServiceImpl.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.configurationsetting; import cn.hutool.core.collection.CollUtil; import com.google.common.annotations.VisibleForTesting; import com.win.framework.common.exception.ServiceException; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.datapermission.core.util.DataPermissionUtils; import com.win.module.wms.controller.configurationsetting.vo.*; @@ -89,7 +90,10 @@ public class ConfigurationsettingServiceImpl implements ConfigurationsettingServ public List getConfigurationsettingList(ConfigurationsettingExportReqVO exportReqVO) { return configurationsettingMapper.selectList(exportReqVO); } - + @Override + public PageResult getConfigurationsettingSenior(CustomConditions conditions) { + return configurationsettingMapper.selectSenior(conditions); + } @Override public List importConfigurationsettingList(List configurationSettings, Integer mode, Boolean updatePart) { if (CollUtil.isEmpty(configurationSettings)) { 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 806ba24c..60e9ca93 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 @@ -192,21 +192,21 @@ public class ItembasicServiceImpl implements ItembasicService { } catch (ServiceException ex) { massage += ex.getMessage() + ","; } - } - if(StrUtil.isNotEmpty(massage)){ - massage.substring(0,massage.length()-1); - errorList.add(importItembasic); - } - if(errorList == null){ - // 判断如果不存在，在进行插入 - ItembasicDO existItembasic = itembasicMapper.selectByCode(importItembasic.getCode()); - if (existItembasic == null&& mode != 3) { - itembasicMapper.insert(ItembasicConvert.INSTANCE.convert(importItembasic)); + if(StrUtil.isNotEmpty(massage)){ + massage.substring(0,massage.length()-1); + errorList.add(importItembasic); } - else if (existItembasic != null && mode != 2) {// 如果存在，判断是否允许更新 - ItembasicDO itembasicDO = ItembasicConvert.INSTANCE.convert(importItembasic); - itembasicDO.setId(existItembasic.getId()); - itembasicMapper.updateById(itembasicDO); + if(errorList == null){ + // 判断如果不存在，在进行插入 + ItembasicDO existItembasic = itembasicMapper.selectByCode(importItembasic.getCode()); + if (existItembasic == null&& mode != 3) { + itembasicMapper.insert(ItembasicConvert.INSTANCE.convert(importItembasic)); + } + else if (existItembasic != null && mode != 2) {// 如果存在，判断是否允许更新 + ItembasicDO itembasicDO = ItembasicConvert.INSTANCE.convert(importItembasic); + itembasicDO.setId(existItembasic.getId()); + itembasicMapper.updateById(itembasicDO); + } } } }); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/backflushRecord/BackflushRecordDetailbService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRecord/BackflushRecordDetailbService.java similarity index 73% rename from win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/backflushRecord/BackflushRecordDetailbService.java rename to win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRecord/BackflushRecordDetailbService.java index 9b167c22..43ea6461 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/backflushRecord/BackflushRecordDetailbService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRecord/BackflushRecordDetailbService.java @@ -1,14 +1,15 @@ -package com.win.module.wms.service.backflushRecord; +package com.win.module.wms.service.productreceiptRecord; -import java.util.*; -import javax.validation.*; - -import com.win.module.wms.controller.backflushRecord.vo.BackflushRecordDetailbCreateReqVO; -import com.win.module.wms.controller.backflushRecord.vo.BackflushRecordDetailbExportReqVO; -import com.win.module.wms.controller.backflushRecord.vo.BackflushRecordDetailbPageReqVO; -import com.win.module.wms.controller.backflushRecord.vo.BackflushRecordDetailbUpdateReqVO; -import com.win.module.wms.dal.dataobject.backflushRecord.BackflushRecordDetailbDO; import com.win.framework.common.pojo.PageResult; +import com.win.module.wms.controller.productreceiptRecord.vo.BackflushRecordDetailbCreateReqVO; +import com.win.module.wms.controller.productreceiptRecord.vo.BackflushRecordDetailbExportReqVO; +import com.win.module.wms.controller.productreceiptRecord.vo.BackflushRecordDetailbPageReqVO; +import com.win.module.wms.controller.productreceiptRecord.vo.BackflushRecordDetailbUpdateReqVO; +import com.win.module.wms.dal.dataobject.productreceiptRecord.BackflushRecordDetailbDO; + +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; /** * 制品收货记录子 Service 接口 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/backflushRecord/BackflushRecordDetailbServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRecord/BackflushRecordDetailbServiceImpl.java similarity index 52% rename from win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/backflushRecord/BackflushRecordDetailbServiceImpl.java rename to win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRecord/BackflushRecordDetailbServiceImpl.java index fccc316e..fdb1236e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/backflushRecord/BackflushRecordDetailbServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRecord/BackflushRecordDetailbServiceImpl.java @@ -1,23 +1,22 @@ -package com.win.module.wms.service.backflushRecord; +package com.win.module.wms.service.productreceiptRecord; -import com.win.module.wms.controller.backflushRecord.vo.BackflushRecordDetailbCreateReqVO; -import com.win.module.wms.controller.backflushRecord.vo.BackflushRecordDetailbExportReqVO; -import com.win.module.wms.controller.backflushRecord.vo.BackflushRecordDetailbPageReqVO; -import com.win.module.wms.controller.backflushRecord.vo.BackflushRecordDetailbUpdateReqVO; +import com.win.framework.common.pojo.PageResult; +import com.win.module.wms.controller.productreceiptRecord.vo.BackflushRecordDetailbCreateReqVO; +import com.win.module.wms.controller.productreceiptRecord.vo.BackflushRecordDetailbExportReqVO; +import com.win.module.wms.controller.productreceiptRecord.vo.BackflushRecordDetailbPageReqVO; +import com.win.module.wms.controller.productreceiptRecord.vo.BackflushRecordDetailbUpdateReqVO; +import com.win.module.wms.convert.productreceiptRecord.BackflushRecordDetailbConvert; +import com.win.module.wms.dal.dataobject.productreceiptRecord.BackflushRecordDetailbDO; +import com.win.module.wms.dal.mysql.productreceiptRecord.BackflushRecordDetailbMapper; import org.springframework.stereotype.Service; -import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; -import java.util.*; - -import com.win.module.wms.dal.dataobject.backflushRecord.BackflushRecordDetailbDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.backflushRecord.BackflushRecordDetailbConvert; -import com.win.module.wms.dal.mysql.backflushRecord.BackflushRecordDetailbMapper; +import javax.annotation.Resource; +import java.util.Collection; +import java.util.List; import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.win.module.wms.enums.ErrorCodeConstants.*; +import static com.win.module.wms.enums.ErrorCodeConstants.BACKFLUSH_RECORD_DETAILB_NOT_EXISTS; /** * 制品收货记录子 Service 实现类 @@ -29,15 +28,15 @@ import static com.win.module.wms.enums.ErrorCodeConstants.*; public class BackflushRecordDetailbServiceImpl implements BackflushRecordDetailbService { @Resource - private BackflushRecordDetailbMapper backflushRecordDetailbMapper; + private BackflushRecordDetailbMapper productreceiptRecordDetailbMapper; @Override public String createBackflushRecordDetailb(BackflushRecordDetailbCreateReqVO createReqVO) { // 插入 - BackflushRecordDetailbDO backflushRecordDetailb = BackflushRecordDetailbConvert.INSTANCE.convert(createReqVO); - backflushRecordDetailbMapper.insert(backflushRecordDetailb); + BackflushRecordDetailbDO productreceiptRecordDetailb = BackflushRecordDetailbConvert.INSTANCE.convert(createReqVO); + productreceiptRecordDetailbMapper.insert(productreceiptRecordDetailb); // 返回 - return backflushRecordDetailb.getId(); + return productreceiptRecordDetailb.getId(); } @Override @@ -46,7 +45,7 @@ public class BackflushRecordDetailbServiceImpl implements BackflushRecordDetailb validateBackflushRecordDetailbExists(updateReqVO.getId().toString()); // 更新 BackflushRecordDetailbDO updateObj = BackflushRecordDetailbConvert.INSTANCE.convert(updateReqVO); - backflushRecordDetailbMapper.updateById(updateObj); + productreceiptRecordDetailbMapper.updateById(updateObj); } @Override @@ -54,33 +53,33 @@ public class BackflushRecordDetailbServiceImpl implements BackflushRecordDetailb // 校验存在 validateBackflushRecordDetailbExists(id); // 删除 - backflushRecordDetailbMapper.deleteById(id); + productreceiptRecordDetailbMapper.deleteById(id); } private void validateBackflushRecordDetailbExists(String id) { - if (backflushRecordDetailbMapper.selectById(id) == null) { + if (productreceiptRecordDetailbMapper.selectById(id) == null) { throw exception(BACKFLUSH_RECORD_DETAILB_NOT_EXISTS); } } @Override public BackflushRecordDetailbDO getBackflushRecordDetailb(String id) { - return backflushRecordDetailbMapper.selectById(id); + return productreceiptRecordDetailbMapper.selectById(id); } @Override public List getBackflushRecordDetailbList(Collection ids) { - return backflushRecordDetailbMapper.selectBatchIds(ids); + return productreceiptRecordDetailbMapper.selectBatchIds(ids); } @Override public PageResult getBackflushRecordDetailbPage(BackflushRecordDetailbPageReqVO pageReqVO) { - return backflushRecordDetailbMapper.selectPage(pageReqVO); + return productreceiptRecordDetailbMapper.selectPage(pageReqVO); } @Override public List getBackflushRecordDetailbList(BackflushRecordDetailbExportReqVO exportReqVO) { - return backflushRecordDetailbMapper.selectList(exportReqVO); + return productreceiptRecordDetailbMapper.selectList(exportReqVO); } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/consumeRecord/ConsumeRecordDetailbService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRecord/ConsumeRecordDetailbService.java similarity index 77% rename from win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/consumeRecord/ConsumeRecordDetailbService.java rename to win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRecord/ConsumeRecordDetailbService.java index 563ed07b..d37a79d5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/consumeRecord/ConsumeRecordDetailbService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRecord/ConsumeRecordDetailbService.java @@ -1,14 +1,15 @@ -package com.win.module.wms.service.consumeRecord; +package com.win.module.wms.service.productrepairRecord; -import java.util.*; -import javax.validation.*; - -import com.win.module.wms.controller.consumeRecord.vo.ConsumeRecordDetailbCreateReqVO; -import com.win.module.wms.controller.consumeRecord.vo.ConsumeRecordDetailbExportReqVO; -import com.win.module.wms.controller.consumeRecord.vo.ConsumeRecordDetailbPageReqVO; -import com.win.module.wms.controller.consumeRecord.vo.ConsumeRecordDetailbUpdateReqVO; -import com.win.module.wms.dal.dataobject.consumeRecord.ConsumeRecordDetailbDO; import com.win.framework.common.pojo.PageResult; +import com.win.module.wms.controller.productrepairRecord.vo.ConsumeRecordDetailbCreateReqVO; +import com.win.module.wms.controller.productrepairRecord.vo.ConsumeRecordDetailbExportReqVO; +import com.win.module.wms.controller.productrepairRecord.vo.ConsumeRecordDetailbPageReqVO; +import com.win.module.wms.controller.productrepairRecord.vo.ConsumeRecordDetailbUpdateReqVO; +import com.win.module.wms.dal.dataobject.consumeRecord.ConsumeRecordDetailbDO; + +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; /** * 制品返修记录子 Service 接口 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/consumeRecord/ConsumeRecordDetailbServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRecord/ConsumeRecordDetailbServiceImpl.java similarity index 77% rename from win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/consumeRecord/ConsumeRecordDetailbServiceImpl.java rename to win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRecord/ConsumeRecordDetailbServiceImpl.java index b3a50ebf..ed20b791 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/consumeRecord/ConsumeRecordDetailbServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRecord/ConsumeRecordDetailbServiceImpl.java @@ -1,23 +1,22 @@ -package com.win.module.wms.service.consumeRecord; +package com.win.module.wms.service.productrepairRecord; -import com.win.module.wms.controller.consumeRecord.vo.ConsumeRecordDetailbCreateReqVO; -import com.win.module.wms.controller.consumeRecord.vo.ConsumeRecordDetailbExportReqVO; -import com.win.module.wms.controller.consumeRecord.vo.ConsumeRecordDetailbPageReqVO; -import com.win.module.wms.controller.consumeRecord.vo.ConsumeRecordDetailbUpdateReqVO; +import com.win.framework.common.pojo.PageResult; +import com.win.module.wms.controller.productrepairRecord.vo.ConsumeRecordDetailbCreateReqVO; +import com.win.module.wms.controller.productrepairRecord.vo.ConsumeRecordDetailbExportReqVO; +import com.win.module.wms.controller.productrepairRecord.vo.ConsumeRecordDetailbPageReqVO; +import com.win.module.wms.controller.productrepairRecord.vo.ConsumeRecordDetailbUpdateReqVO; +import com.win.module.wms.convert.productrepairRecord.ConsumeRecordDetailbConvert; +import com.win.module.wms.dal.dataobject.consumeRecord.ConsumeRecordDetailbDO; +import com.win.module.wms.dal.mysql.productrepairRecord.ConsumeRecordDetailbMapper; import org.springframework.stereotype.Service; -import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; -import java.util.*; - -import com.win.module.wms.dal.dataobject.consumeRecord.ConsumeRecordDetailbDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.consumeRecord.ConsumeRecordDetailbConvert; -import com.win.module.wms.dal.mysql.consumeRecord.ConsumeRecordDetailbMapper; +import javax.annotation.Resource; +import java.util.Collection; +import java.util.List; import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.win.module.wms.enums.ErrorCodeConstants.*; +import static com.win.module.wms.enums.ErrorCodeConstants.CONSUME_RECORD_DETAILB_NOT_EXISTS; /** * 制品返修记录子 Service 实现类