diff --git a/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/ErrorCodeConstants.java b/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/ErrorCodeConstants.java index ce2fab48..0f08bf05 100644 --- a/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/ErrorCodeConstants.java +++ b/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/ErrorCodeConstants.java @@ -910,5 +910,9 @@ public interface ErrorCodeConstants { ErrorCode QTY_ERRORR = new ErrorCode(1_000_301_001, "上架数量【{}】不能大于库存数量【{}】"); ErrorCode TIME_AFTER = new ErrorCode(1_000_302_000, "申请时间【{}】小于截止时间【{}】"); + + ErrorCode BARBASIC_NOT_EXISTS = new ErrorCode(1_000_303_000, "条码实体基类不存在"); + + ErrorCode BARBASIC_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_000_303_001, "条码实体列表不存在"); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/barcode/vo/BarcodeBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/barcode/vo/BarcodeBaseVO.java index 9e683b12..7f26f88f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/barcode/vo/BarcodeBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/barcode/vo/BarcodeBaseVO.java @@ -58,4 +58,7 @@ public class BarcodeBaseVO { @NotNull(message = "是否加密不能为空") private String isEncypt; + @Schema(description = "条码类型") + private String labelType; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/barcode/vo/BarcodeExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/barcode/vo/BarcodeExportReqVO.java index 3e3d2b37..c24cdd66 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/barcode/vo/BarcodeExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/barcode/vo/BarcodeExportReqVO.java @@ -43,4 +43,7 @@ public class BarcodeExportReqVO { @Schema(description = "是否加密") private String isEncypt; + @Schema(description = "条码类型") + private String labelType; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/barcode/vo/BarcodePageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/barcode/vo/BarcodePageReqVO.java index 8a92876d..fcf8c227 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/barcode/vo/BarcodePageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/barcode/vo/BarcodePageReqVO.java @@ -48,4 +48,7 @@ public class BarcodePageReqVO extends PageParam { @Schema(description = "是否加密") private String isEncypt; + @Schema(description = "条码类型") + private String labelType; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labelBarbasic/BarbasicController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labelBarbasic/BarbasicController.java new file mode 100644 index 00000000..171d9e6a --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labelBarbasic/BarbasicController.java @@ -0,0 +1,106 @@ +package com.win.module.wms.controller.labelBarbasic; + +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 io.swagger.v3.oas.annotations.Operation; +import javax.validation.*; +import javax.servlet.http.*; +import java.util.*; +import java.io.IOException; +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.labelBarbasic.vo.*; +import com.win.module.wms.dal.dataobject.labelBarbasic.BarbasicDO; +import com.win.module.wms.convert.labelBarbasic.BarbasicConvert; +import com.win.module.wms.service.labelBarbasic.BarbasicService; + + +@Tag(name = "管理后台 - 条码实体基类") +@RestController +@RequestMapping("/wms/barbasic") +@Validated +public class BarbasicController { + + @Resource + private BarbasicService barbasicService; + + @PostMapping("/create") + @Operation(summary = "创建条码实体基类") + @PreAuthorize("@ss.hasPermission('wms:barbasic:create')") + public CommonResult createBarbasic(@Valid @RequestBody BarbasicCreateReqVO createReqVO) { + return success(barbasicService.createBarbasic(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "更新条码实体基类") + @PreAuthorize("@ss.hasPermission('wms:barbasic:update')") + public CommonResult updateBarbasic(@Valid @RequestBody BarbasicUpdateReqVO updateReqVO) { + int result = barbasicService.updateBarbasic(updateReqVO); + return success(result > 0); + } + + @DeleteMapping("/delete") + @Operation(summary = "删除条码实体基类") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('wms:barbasic:delete')") + public CommonResult deleteBarbasic(@RequestParam("id") Long id) { + int result = barbasicService.deleteBarbasic(id); + return success(result > 0); + } + + @GetMapping("/get") + @Operation(summary = "获得条码实体基类") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('wms:barbasic:query')") + public CommonResult getBarbasic(@RequestParam("id") Long id) { + BarbasicDO barbasic = barbasicService.getBarbasic(id); + return success(BarbasicConvert.INSTANCE.convert(barbasic)); + } + + @GetMapping("/list") + @Operation(summary = "获得条码实体基类列表") + @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048") + @PreAuthorize("@ss.hasPermission('wms:barbasic:query')") + public CommonResult> getBarbasicList(@RequestParam("ids") Collection ids) { + List list = barbasicService.getBarbasicList(ids); + return success(BarbasicConvert.INSTANCE.convertList(list)); + } + + @GetMapping("/page") + @Operation(summary = "获得条码实体基类分页") + @PreAuthorize("@ss.hasPermission('wms:barbasic:query')") + public CommonResult> getBarbasicPage(@Valid BarbasicPageReqVO pageVO) { + PageResult pageResult = barbasicService.getBarbasicPage(pageVO); + return success(BarbasicConvert.INSTANCE.convertPage(pageResult)); + } + + @GetMapping("/export-excel") + @Operation(summary = "导出条码实体基类 Excel") + @PreAuthorize("@ss.hasPermission('wms:barbasic:export')") + @OperateLog(type = EXPORT) + public void exportBarbasicExcel(@Valid BarbasicExportReqVO exportReqVO, + HttpServletResponse response) throws IOException { + List list = barbasicService.getBarbasicList(exportReqVO); + // 导出 Excel + List datas = BarbasicConvert.INSTANCE.convertList02(list); + ExcelUtils.write(response, "条码实体基类.xls", "数据", BarbasicExcelVO.class, datas); + } + + @GetMapping("/get-import-template") + @Operation(summary = "获得导入条码实体基类模板") + public void importTemplate(HttpServletResponse response) throws IOException { + List list = Arrays.asList(); + // 输出 + ExcelUtils.write(response, "条码实体基类基本信息导入模板.xls", "条码实体基类基本信息列表", BarbasicExcelVO.class, list); + } + + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labelBarbasic/vo/BarbasicBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labelBarbasic/vo/BarbasicBaseVO.java new file mode 100644 index 00000000..942efe16 --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labelBarbasic/vo/BarbasicBaseVO.java @@ -0,0 +1,54 @@ +package com.win.module.wms.controller.labelBarbasic.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.util.*; +import javax.validation.constraints.*; + +/** + * 条码实体基类 Base VO，提供给添加、修改、详细的子 VO 使用 + * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成 + */ +@Data +public class BarbasicBaseVO { + + @Schema(description = "id", example = "id") + private Long id; + + @Schema(description = "标签号", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "标签号不能为空") + private String number; + + @Schema(description = "标签类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @NotNull(message = "标签类型不能为空") + private String type; + + @Schema(description = "标签模板", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "标签模板不能为空") + private String template; + + @Schema(description = "标签状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") + @NotNull(message = "标签状态不能为空") + private String status; + + @Schema(description = "关联号") + private String relateNumber; + + @Schema(description = "标签条码字符串", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "标签条码字符串不能为空") + private String barcodeString; + + @Schema(description = "打印次数", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "打印次数不能为空") + private Integer printTimes; + + @Schema(description = "最后打印时间") + private String lastPrintTime; + + @Schema(description = "最后打印人ID", example = "8732") + private String lastPrintUserId; + + @Schema(description = "最后打印人用户名", example = "王五") + private String lastPrintUserName; + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labelBarbasic/vo/BarbasicCreateReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labelBarbasic/vo/BarbasicCreateReqVO.java new file mode 100644 index 00000000..1cc93949 --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labelBarbasic/vo/BarbasicCreateReqVO.java @@ -0,0 +1,12 @@ +package com.win.module.wms.controller.labelBarbasic.vo; + +import lombok.*; +import io.swagger.v3.oas.annotations.media.Schema; + +@Schema(description = "管理后台 - 条码实体基类创建 Request VO") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class BarbasicCreateReqVO extends BarbasicBaseVO { + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labelBarbasic/vo/BarbasicExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labelBarbasic/vo/BarbasicExcelVO.java new file mode 100644 index 00000000..66562c67 --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labelBarbasic/vo/BarbasicExcelVO.java @@ -0,0 +1,50 @@ +package com.win.module.wms.controller.labelBarbasic.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.util.*; + +import com.alibaba.excel.annotation.ExcelProperty; + +/** + * 条码实体基类 Excel VO + * + * @author 超级管理员 + */ +@Data +public class BarbasicExcelVO { + + @ExcelProperty("id") + private Long id; + + @ExcelProperty("标签号") + private String number; + + @ExcelProperty("标签类型") + private String type; + + @ExcelProperty("标签模板") + private String template; + + @ExcelProperty("标签状态") + private String status; + + @ExcelProperty("关联号") + private String relateNumber; + + @ExcelProperty("标签条码字符串") + private String barcodeString; + + @ExcelProperty("打印次数") + private Integer printTimes; + + @ExcelProperty("最后打印时间") + private String lastPrintTime; + + @ExcelProperty("最后打印人ID") + private String lastPrintUserId; + + @ExcelProperty("最后打印人用户名") + private String lastPrintUserName; + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labelBarbasic/vo/BarbasicExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labelBarbasic/vo/BarbasicExportReqVO.java new file mode 100644 index 00000000..faa005b3 --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labelBarbasic/vo/BarbasicExportReqVO.java @@ -0,0 +1,45 @@ +package com.win.module.wms.controller.labelBarbasic.vo; + +import com.alibaba.excel.annotation.format.DateTimeFormat; +import lombok.*; +import java.util.*; +import io.swagger.v3.oas.annotations.media.Schema; +import com.win.framework.common.pojo.PageParam; + +import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; + +@Schema(description = "管理后台 - 条码实体基类 Excel 导出 Request VO，参数和 BarbasicPageReqVO 是一致的") +@Data +public class BarbasicExportReqVO { + + @Schema(description = "标签号") + private String number; + + @Schema(description = "标签类型", example = "1") + private String type; + + @Schema(description = "标签模板") + private String template; + + @Schema(description = "标签状态", example = "2") + private String status; + + @Schema(description = "关联号") + private String relateNumber; + + @Schema(description = "标签条码字符串") + private String barcodeString; + + @Schema(description = "打印次数") + private Integer printTimes; + + @Schema(description = "最后打印时间") + private String[] lastPrintTime; + + @Schema(description = "最后打印人ID", example = "8732") + private String lastPrintUserId; + + @Schema(description = "最后打印人用户名", example = "王五") + private String lastPrintUserName; + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labelBarbasic/vo/BarbasicPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labelBarbasic/vo/BarbasicPageReqVO.java new file mode 100644 index 00000000..d541f2c3 --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labelBarbasic/vo/BarbasicPageReqVO.java @@ -0,0 +1,44 @@ +package com.win.module.wms.controller.labelBarbasic.vo; + +import lombok.*; +import java.util.*; +import io.swagger.v3.oas.annotations.media.Schema; +import com.win.framework.common.pojo.PageParam; + +@Schema(description = "管理后台 - 条码实体基类分页 Request VO") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class BarbasicPageReqVO extends PageParam { + + @Schema(description = "标签号") + private String number; + + @Schema(description = "标签类型", example = "1") + private String type; + + @Schema(description = "标签模板") + private String template; + + @Schema(description = "标签状态", example = "2") + private String status; + + @Schema(description = "关联号") + private String relateNumber; + + @Schema(description = "标签条码字符串") + private String barcodeString; + + @Schema(description = "打印次数") + private Integer printTimes; + + @Schema(description = "最后打印时间") + private String[] lastPrintTime; + + @Schema(description = "最后打印人ID", example = "8732") + private String lastPrintUserId; + + @Schema(description = "最后打印人用户名", example = "王五") + private String lastPrintUserName; + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labelBarbasic/vo/BarbasicRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labelBarbasic/vo/BarbasicRespVO.java new file mode 100644 index 00000000..698cd996 --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labelBarbasic/vo/BarbasicRespVO.java @@ -0,0 +1,15 @@ +package com.win.module.wms.controller.labelBarbasic.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; + +@Schema(description = "管理后台 - 条码实体基类 Response VO") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class BarbasicRespVO extends BarbasicBaseVO { + + @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "29175") + private Long id; + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labelBarbasic/vo/BarbasicUpdateReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labelBarbasic/vo/BarbasicUpdateReqVO.java new file mode 100644 index 00000000..174514f0 --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labelBarbasic/vo/BarbasicUpdateReqVO.java @@ -0,0 +1,18 @@ +package com.win.module.wms.controller.labelBarbasic.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; + +import javax.validation.constraints.*; + +@Schema(description = "管理后台 - 条码实体基类更新 Request VO") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class BarbasicUpdateReqVO extends BarbasicBaseVO { + + @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "29175") + @NotNull(message = "id不能为空") + private Long id; + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/labelBarbasic/BarbasicConvert.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/labelBarbasic/BarbasicConvert.java new file mode 100644 index 00000000..0810787b --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/labelBarbasic/BarbasicConvert.java @@ -0,0 +1,37 @@ +package com.win.module.wms.convert.labelBarbasic; + +import java.util.*; + +import com.win.framework.common.pojo.PageResult; + +import com.win.module.wms.controller.labelBarbasic.vo.BarbasicCreateReqVO; +import com.win.module.wms.controller.labelBarbasic.vo.BarbasicExcelVO; +import com.win.module.wms.controller.labelBarbasic.vo.BarbasicRespVO; +import com.win.module.wms.controller.labelBarbasic.vo.BarbasicUpdateReqVO; +import org.mapstruct.Mapper; +import org.mapstruct.factory.Mappers; +import com.win.module.wms.dal.dataobject.labelBarbasic.BarbasicDO; + +/** + * 条码实体基类 Convert + * + * @author 超级管理员 + */ +@Mapper +public interface BarbasicConvert { + + BarbasicConvert INSTANCE = Mappers.getMapper(BarbasicConvert.class); + + BarbasicDO convert(BarbasicCreateReqVO bean); + + BarbasicDO convert(BarbasicUpdateReqVO bean); + + BarbasicRespVO convert(BarbasicDO bean); + + List convertList(List list); + + PageResult convertPage(PageResult page); + + List convertList02(List list); + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/barcode/BarcodeDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/barcode/BarcodeDO.java index cb8ed046..9cb195d3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/barcode/BarcodeDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/barcode/BarcodeDO.java @@ -75,4 +75,9 @@ public class BarcodeDO extends BaseDO { */ private String isEncypt; + /** + * 条码类型 + */ + private String labelType; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventoryinitRequest/InventoryinitRequestMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventoryinitRequest/InventoryinitRequestMainDO.java index 0e09c635..b7328437 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventoryinitRequest/InventoryinitRequestMainDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventoryinitRequest/InventoryinitRequestMainDO.java @@ -21,7 +21,8 @@ import com.win.framework.mybatis.core.dataobject.BaseDO; @Builder @NoArgsConstructor @AllArgsConstructor -public class InventoryinitRequestMainDO extends BaseDO { +public class +InventoryinitRequestMainDO extends BaseDO { /** * id diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/labelBarbasic/BarbasicDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/labelBarbasic/BarbasicDO.java new file mode 100644 index 00000000..28705a6b --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/labelBarbasic/BarbasicDO.java @@ -0,0 +1,68 @@ +package com.win.module.wms.dal.dataobject.labelBarbasic; + +import lombok.*; +import java.util.*; +import com.baomidou.mybatisplus.annotation.*; +import com.win.framework.mybatis.core.dataobject.BaseDO; + +/** + * 条码实体基类 DO + * + * @author 超级管理员 + */ +@TableName("label_barbasic") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class BarbasicDO extends BaseDO { + + /** + * id + */ + @TableId + private Long id; + /** + * 标签号 + */ + private String number; + /** + * 标签类型 + */ + private String type; + /** + * 标签模板 + */ + private String template; + /** + * 标签状态 + */ + private String status; + /** + * 关联号 + */ + private String relateNumber; + /** + * 标签条码字符串 + */ + private String barcodeString; + /** + * 打印次数 + */ + private Integer printTimes; + /** + * 最后打印时间 + */ + private String lastPrintTime; + /** + * 最后打印人ID + */ + private String lastPrintUserId; + /** + * 最后打印人用户名 + */ + private String lastPrintUserName; + +} 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 6720146f..ff39bffd 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 @@ -35,6 +35,7 @@ public interface BarcodeMapper extends BaseMapperX { .eqIfPresent(BarcodeDO::getMasterId, reqVO.getMasterId()) .eqIfPresent(BarcodeDO::getTrimEnd, reqVO.getTrimEnd()) .eqIfPresent(BarcodeDO::getIsEncypt, reqVO.getIsEncypt()) + .eqIfPresent(BarcodeDO::getLabelType,reqVO.getLabelType()) .orderByDesc(BarcodeDO::getId)); } @@ -55,6 +56,7 @@ public interface BarcodeMapper extends BaseMapperX { .eqIfPresent(BarcodeDO::getMasterId, reqVO.getMasterId()) .eqIfPresent(BarcodeDO::getTrimEnd, reqVO.getTrimEnd()) .eqIfPresent(BarcodeDO::getIsEncypt, reqVO.getIsEncypt()) + .eqIfPresent(BarcodeDO::getLabelType,reqVO.getLabelType()) .orderByDesc(BarcodeDO::getId)); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/labelBarbasic/BarbasicMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/labelBarbasic/BarbasicMapper.java new file mode 100644 index 00000000..7d284111 --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/labelBarbasic/BarbasicMapper.java @@ -0,0 +1,51 @@ +package com.win.module.wms.dal.mysql.labelBarbasic; + +import java.util.*; + +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.labelBarbasic.vo.BarbasicExportReqVO; +import com.win.module.wms.controller.labelBarbasic.vo.BarbasicPageReqVO; +import com.win.module.wms.dal.dataobject.labelBarbasic.BarbasicDO; +import org.apache.ibatis.annotations.Mapper; + +/** + * 条码实体基类 Mapper + * + * @author 超级管理员 + */ +@Mapper +public interface BarbasicMapper extends BaseMapperX { + + default PageResult selectPage(BarbasicPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(BarbasicDO::getNumber, reqVO.getNumber()) + .eqIfPresent(BarbasicDO::getType, reqVO.getType()) + .eqIfPresent(BarbasicDO::getTemplate, reqVO.getTemplate()) + .eqIfPresent(BarbasicDO::getStatus, reqVO.getStatus()) + .eqIfPresent(BarbasicDO::getRelateNumber, reqVO.getRelateNumber()) + .eqIfPresent(BarbasicDO::getBarcodeString, reqVO.getBarcodeString()) + .eqIfPresent(BarbasicDO::getPrintTimes, reqVO.getPrintTimes()) + .betweenIfPresent(BarbasicDO::getLastPrintTime, reqVO.getLastPrintTime()) + .eqIfPresent(BarbasicDO::getLastPrintUserId, reqVO.getLastPrintUserId()) + .likeIfPresent(BarbasicDO::getLastPrintUserName, reqVO.getLastPrintUserName()) + .orderByDesc(BarbasicDO::getId)); + } + + default List selectList(BarbasicExportReqVO reqVO) { + return selectList(new LambdaQueryWrapperX() + .eqIfPresent(BarbasicDO::getNumber, reqVO.getNumber()) + .eqIfPresent(BarbasicDO::getType, reqVO.getType()) + .eqIfPresent(BarbasicDO::getTemplate, reqVO.getTemplate()) + .eqIfPresent(BarbasicDO::getStatus, reqVO.getStatus()) + .eqIfPresent(BarbasicDO::getRelateNumber, reqVO.getRelateNumber()) + .eqIfPresent(BarbasicDO::getBarcodeString, reqVO.getBarcodeString()) + .eqIfPresent(BarbasicDO::getPrintTimes, reqVO.getPrintTimes()) + .betweenIfPresent(BarbasicDO::getLastPrintTime, reqVO.getLastPrintTime()) + .eqIfPresent(BarbasicDO::getLastPrintUserId, reqVO.getLastPrintUserId()) + .likeIfPresent(BarbasicDO::getLastPrintUserName, reqVO.getLastPrintUserName()) + .orderByDesc(BarbasicDO::getId)); + } + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainServiceImpl.java index ea23e594..5231273a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainServiceImpl.java @@ -494,6 +494,7 @@ public class InspectRequestMainServiceImpl implements InspectRequestMainService mainDO.setSampleQty(selectInspectType(mainDO.getReceiveQty(), rule)); } + private InspectRequestMainDO validateInspectRequestMainExists(Long id) { InspectRequestMainDO mainDO = inspectRequestMainMapper.selectById(id); if (mainDO == null) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventoryinitRequest/InventoryinitRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventoryinitRequest/InventoryinitRequestMainServiceImpl.java index fdad737b..77860c83 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventoryinitRequest/InventoryinitRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventoryinitRequest/InventoryinitRequestMainServiceImpl.java @@ -11,7 +11,8 @@ import com.win.module.wms.controller.inventoryinitRecord.vo.InventoryinitRecordD import com.win.module.wms.controller.inventoryinitRecord.vo.InventoryinitRecordMainCreateReqVO; import com.win.module.wms.convert.inventoryinitRecord.InventoryinitRecordDetailConvert; import com.win.module.wms.convert.inventoryinitRecord.InventoryinitRecordMainConvert; -import com.win.module.wms.dal.dataobject.purchasereceiptRequest.PurchasereceiptRequestMainDO; +import com.win.module.wms.dal.dataobject.inventoryinitRecord.InventoryinitRecordDetailDO; +import com.win.module.wms.dal.dataobject.inventoryinitRecord.InventoryinitRecordMainDO; import com.win.module.wms.dal.dataobject.requestsetting.RequestsettingDO; import com.win.module.wms.enums.request.RequestStatusEnum; import com.win.module.wms.enums.request.RequestStatusState; @@ -118,7 +119,6 @@ public class InventoryinitRequestMainServiceImpl implements InventoryinitRequest detailDO.setNumber(number); } inventoryinitRequestDetailMapper.insertBatch(subDOList); - trendsApi.createTrends(requestsettingDO.getId(), "inventoryinitRequestMain", "增加了库存初始化申请", TrendsTypeEnum.CREATE); // 返回 return mainDO.getId(); @@ -189,7 +189,6 @@ public class InventoryinitRequestMainServiceImpl implements InventoryinitRequest } InventoryinitRequestMainDO inventoryinitRequestMainDO = inventoryinitRequestMainMapper.selectById(id); if (inventoryinitRequestMainDO == null) { - throw exception(INVENTORYINIT_REQUEST_MAIN_NOT_EXISTS); } } @@ -257,27 +256,32 @@ public class InventoryinitRequestMainServiceImpl implements InventoryinitRequest InventoryinitRecordMainCreateReqVO inventoryinitRecordMainCreateReqVO = new InventoryinitRecordMainCreateReqVO(); BeanUtils.copyProperties(mainDO, inventoryinitRecordMainCreateReqVO); inventoryinitRecordMainCreateReqVO.setRequestNumber(mainDO.getNumber()); - String number = serialNumberApi.generateCode(RuleCodeEnum.PURCHASE_RECEIPT_RECORD.getCode()); + String number = serialNumberApi.generateCode(RuleCodeEnum.INVENTORY_INITIAL_RECORD.getCode()); inventoryinitRecordMainCreateReqVO.setNumber(number); - //增加业务类型 - BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("PurchaseReceiptRecord"); - inventoryinitRecordMainCreateReqVO.setBusinessType(businesstypeDO.getCode()); - inventoryinitRecordMainMapper.insert(InventoryinitRecordMainConvert.INSTANCE.convert(inventoryinitRecordMainCreateReqVO)); + InventoryinitRecordMainDO inventoryinitRecordMainDO = InventoryinitRecordMainConvert.INSTANCE.convert(inventoryinitRecordMainCreateReqVO); + inventoryinitRecordMainDO.setId(null); + inventoryinitRecordMainDO.setCreator(null); + inventoryinitRecordMainDO.setCreateTime(null); + inventoryinitRecordMainDO.setUpdater(null); + inventoryinitRecordMainDO.setUpdateTime(null); + inventoryinitRecordMainMapper.insert(inventoryinitRecordMainDO); for(InventoryinitRequestDetailDO inventoryinitRequestDetailDO : detailDOList) { InventoryinitRecordDetailCreateReqVO inventoryinitRecordDetailCreateReqVO = new InventoryinitRecordDetailCreateReqVO(); BeanUtils.copyProperties(inventoryinitRequestDetailDO, inventoryinitRecordDetailCreateReqVO); inventoryinitRecordDetailCreateReqVO.setNumber(number); - inventoryinitRecordDetailMapper.insert(InventoryinitRecordDetailConvert.INSTANCE.convert(inventoryinitRecordDetailCreateReqVO)); + InventoryinitRecordDetailDO inventoryinitRecordDetailDO = InventoryinitRecordDetailConvert.INSTANCE.convert(inventoryinitRecordDetailCreateReqVO); + inventoryinitRecordDetailDO.setId(null); + inventoryinitRecordDetailDO.setCreateTime(null); + inventoryinitRecordDetailDO.setCreator(null); + inventoryinitRecordDetailDO.setUpdater(null); + inventoryinitRecordDetailDO.setUpdateTime(null); + inventoryinitRecordDetailMapper.insert(inventoryinitRecordDetailDO); } } - - } - - private InventoryinitRequestDetailDO validitempackaging(InventoryinitRequestDetailDO detailDo){ ItempackagingDO itempackaging = itempackagingService.selectItemPackagingExist(detailDo.getItemCode()); detailDo.setStdPackUnit(itempackaging.getStdPackUnit()); @@ -423,7 +427,6 @@ public class InventoryinitRequestMainServiceImpl implements InventoryinitRequest public Integer reAddInventoryinitRequestMain(Long id) { // 校验存在存在下级单据 InventoryinitRequestMainDO mainDO = valiteInventoryinitRequestMainExists(id); - RequestStatusState requestStatusState = new RequestStatusState(mainDO.getStatus()); boolean flag = requestStatusState.reAdd(); if(!flag) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/labelBarbasic/BarbasicService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/labelBarbasic/BarbasicService.java new file mode 100644 index 00000000..080f3288 --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/labelBarbasic/BarbasicService.java @@ -0,0 +1,71 @@ +package com.win.module.wms.service.labelBarbasic; + +import java.util.*; +import javax.validation.*; +import com.win.module.wms.controller.labelBarbasic.vo.*; +import com.win.module.wms.dal.dataobject.labelBarbasic.BarbasicDO; +import com.win.framework.common.pojo.PageResult; + +/** + * 条码实体基类 Service 接口 + * + * @author 超级管理员 + */ +public interface BarbasicService { + + /** + * 创建条码实体基类 + * + * @param createReqVO 创建信息 + * @return 编号 + */ + Long createBarbasic(@Valid BarbasicCreateReqVO createReqVO); + + /** + * 更新条码实体基类 + * + * @param updateReqVO 更新信息 + */ + Integer updateBarbasic(@Valid BarbasicUpdateReqVO updateReqVO); + + /** + * 删除条码实体基类 + * + * @param id 编号 + */ + Integer deleteBarbasic(Long id); + + /** + * 获得条码实体基类 + * + * @param id 编号 + * @return 条码实体基类 + */ + BarbasicDO getBarbasic(Long id); + + /** + * 获得条码实体基类列表 + * + * @param ids 编号 + * @return 条码实体基类列表 + */ + List getBarbasicList(Collection ids); + + /** + * 获得条码实体基类分页 + * + * @param pageReqVO 分页查询 + * @return 条码实体基类分页 + */ + PageResult getBarbasicPage(BarbasicPageReqVO pageReqVO); + + /** + * 获得条码实体基类列表, 用于 Excel 导出 + * + * @param exportReqVO 查询条件 + * @return 条码实体基类列表 + */ + List getBarbasicList(BarbasicExportReqVO exportReqVO); + + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/labelBarbasic/BarbasicServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/labelBarbasic/BarbasicServiceImpl.java new file mode 100644 index 00000000..46f3f206 --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/labelBarbasic/BarbasicServiceImpl.java @@ -0,0 +1,84 @@ +package com.win.module.wms.service.labelBarbasic; + + +import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import org.springframework.validation.annotation.Validated; + +import java.util.*; +import com.win.module.wms.controller.labelBarbasic.vo.*; +import com.win.module.wms.dal.dataobject.labelBarbasic.BarbasicDO; +import com.win.framework.common.pojo.PageResult; + +import com.win.module.wms.convert.labelBarbasic.BarbasicConvert; +import com.win.module.wms.dal.mysql.labelBarbasic.BarbasicMapper; + +import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; +import static com.win.module.wms.enums.ErrorCodeConstants.*; + +/** + * 条码实体基类 Service 实现类 + * + * @author 超级管理员 + */ +@Service +@Validated +public class BarbasicServiceImpl implements BarbasicService { + + @Resource + private BarbasicMapper barbasicMapper; + + @Override + public Long createBarbasic(BarbasicCreateReqVO createReqVO) { + // 插入 + BarbasicDO barbasic = BarbasicConvert.INSTANCE.convert(createReqVO); + barbasicMapper.insert(barbasic); + // 返回 + return barbasic.getId(); + } + + @Override + public Integer updateBarbasic(BarbasicUpdateReqVO updateReqVO) { + // 校验存在 + validateBarbasicExists(updateReqVO.getId()); + // 更新 + BarbasicDO updateObj = BarbasicConvert.INSTANCE.convert(updateReqVO); + return barbasicMapper.updateById(updateObj); + } + + @Override + public Integer deleteBarbasic(Long id) { + // 校验存在 + validateBarbasicExists(id); + // 删除 + return barbasicMapper.deleteById(id); + } + + private void validateBarbasicExists(Long id) { + if (barbasicMapper.selectById(id) == null) { + throw exception(BARBASIC_NOT_EXISTS); + } + } + + @Override + public BarbasicDO getBarbasic(Long id) { + return barbasicMapper.selectById(id); + } + + @Override + public List getBarbasicList(Collection ids) { + return barbasicMapper.selectBatchIds(ids); + } + + @Override + public PageResult getBarbasicPage(BarbasicPageReqVO pageReqVO) { + return barbasicMapper.selectPage(pageReqVO); + } + + @Override + public List getBarbasicList(BarbasicExportReqVO exportReqVO) { + return barbasicMapper.selectList(exportReqVO); + } + + +}