diff --git a/wms-module-system/src/main/java/top/wms/admin/fullWorkOrder/model/entity/FullWorkOrderDO.java b/wms-module-system/src/main/java/top/wms/admin/fullWorkOrder/model/entity/FullWorkOrderDO.java index cbe3313..d2bda57 100644 --- a/wms-module-system/src/main/java/top/wms/admin/fullWorkOrder/model/entity/FullWorkOrderDO.java +++ b/wms-module-system/src/main/java/top/wms/admin/fullWorkOrder/model/entity/FullWorkOrderDO.java @@ -36,6 +36,11 @@ public class FullWorkOrderDO extends BaseDO { */ private String materialCode; + /** + * 打印物料编码 + */ + private String encodingPrint; + /** * 图片地址 */ diff --git a/wms-module-system/src/main/java/top/wms/admin/fullWorkOrder/model/query/FullWorkOrderQuery.java b/wms-module-system/src/main/java/top/wms/admin/fullWorkOrder/model/query/FullWorkOrderQuery.java index 4b4b713..93360b7 100644 --- a/wms-module-system/src/main/java/top/wms/admin/fullWorkOrder/model/query/FullWorkOrderQuery.java +++ b/wms-module-system/src/main/java/top/wms/admin/fullWorkOrder/model/query/FullWorkOrderQuery.java @@ -37,6 +37,12 @@ public class FullWorkOrderQuery implements Serializable { @Schema(description = "物料编码") private String materialCode; + /** + * 打印物料编码 + */ + @Schema(description = "打印编码(国产替代)") + private String encodingPrint; + /** * 物料名称 */ diff --git a/wms-module-system/src/main/java/top/wms/admin/fullWorkOrder/model/req/FullWorkOrderReq.java b/wms-module-system/src/main/java/top/wms/admin/fullWorkOrder/model/req/FullWorkOrderReq.java index dde32bc..a5db1e0 100644 --- a/wms-module-system/src/main/java/top/wms/admin/fullWorkOrder/model/req/FullWorkOrderReq.java +++ b/wms-module-system/src/main/java/top/wms/admin/fullWorkOrder/model/req/FullWorkOrderReq.java @@ -45,6 +45,14 @@ public class FullWorkOrderReq implements Serializable { @Length(max = 255, message = "物料编码长度不能超过 {max} 个字符") private String materialCode; + /** + * 打印物料编码 + */ + @Schema(description = "打印编码(国产替代)") + @NotBlank(message = "打印编码(国产替代)不能为空") + private String encodingPrint; + + /** /** * 图片地址 */ diff --git a/wms-module-system/src/main/java/top/wms/admin/fullWorkOrder/model/resp/FullWorkOrderResp.java b/wms-module-system/src/main/java/top/wms/admin/fullWorkOrder/model/resp/FullWorkOrderResp.java index dd13c84..2f9c022 100644 --- a/wms-module-system/src/main/java/top/wms/admin/fullWorkOrder/model/resp/FullWorkOrderResp.java +++ b/wms-module-system/src/main/java/top/wms/admin/fullWorkOrder/model/resp/FullWorkOrderResp.java @@ -44,6 +44,12 @@ public class FullWorkOrderResp extends BaseDetailResp { @ExcelProperty(value = "物料编码", order = 4) private String materialCode; + /** + * 打印物料编码 + */ + @Schema(description = "打印编码(国产替代)") + private String encodingPrint; + /** * 物料名称 */ diff --git a/wms-module-system/src/main/java/top/wms/admin/fullWorkOrder/service/impl/FullWorkOrderServiceImpl.java b/wms-module-system/src/main/java/top/wms/admin/fullWorkOrder/service/impl/FullWorkOrderServiceImpl.java index b7cadbf..82fe016 100644 --- a/wms-module-system/src/main/java/top/wms/admin/fullWorkOrder/service/impl/FullWorkOrderServiceImpl.java +++ b/wms-module-system/src/main/java/top/wms/admin/fullWorkOrder/service/impl/FullWorkOrderServiceImpl.java @@ -26,6 +26,8 @@ import top.wms.admin.fullWorkOrder.model.req.FullWorkOrderInfoReq; import top.wms.admin.fullWorkOrder.model.req.FullWorkOrderReq; import top.wms.admin.fullWorkOrder.model.resp.FullWorkOrderResp; import top.wms.admin.fullWorkOrder.service.FullWorkOrderService; +import top.wms.admin.material.mapper.MaterialInfoMapper; +import top.wms.admin.material.model.entity.MaterialInfoDO; import java.util.Date; import java.util.List; @@ -42,6 +44,8 @@ public class FullWorkOrderServiceImpl extends BaseServiceImpl page(FullWorkOrderQuery query, PageQuery pageQuery) { QueryWrapper queryWrapper = new QueryWrapper<>(); diff --git a/wms-module-system/src/main/java/top/wms/admin/material/model/entity/MaterialInfoDO.java b/wms-module-system/src/main/java/top/wms/admin/material/model/entity/MaterialInfoDO.java index f599b53..f16d7fe 100644 --- a/wms-module-system/src/main/java/top/wms/admin/material/model/entity/MaterialInfoDO.java +++ b/wms-module-system/src/main/java/top/wms/admin/material/model/entity/MaterialInfoDO.java @@ -32,6 +32,11 @@ public class MaterialInfoDO extends BaseDO { */ private String encoding; + /** + * 打印物料编码 + */ + private String encodingPrint; + /** * 物料单位重量(g) */ diff --git a/wms-module-system/src/main/java/top/wms/admin/material/model/query/MaterialInfoQuery.java b/wms-module-system/src/main/java/top/wms/admin/material/model/query/MaterialInfoQuery.java index b5b696f..e70e410 100644 --- a/wms-module-system/src/main/java/top/wms/admin/material/model/query/MaterialInfoQuery.java +++ b/wms-module-system/src/main/java/top/wms/admin/material/model/query/MaterialInfoQuery.java @@ -37,6 +37,13 @@ public class MaterialInfoQuery implements Serializable { @Query(type = QueryType.EQ) private String encoding; + /** + * 打印物料编码 + */ + @Schema(description = "打印编码(国产替代)") + @Query(type = QueryType.EQ) + private String encodingPrint; + /** * 批次 */ diff --git a/wms-module-system/src/main/java/top/wms/admin/material/model/req/MaterialImportRowReq.java b/wms-module-system/src/main/java/top/wms/admin/material/model/req/MaterialImportRowReq.java index 1788c7f..9347f62 100644 --- a/wms-module-system/src/main/java/top/wms/admin/material/model/req/MaterialImportRowReq.java +++ b/wms-module-system/src/main/java/top/wms/admin/material/model/req/MaterialImportRowReq.java @@ -29,9 +29,17 @@ public class MaterialImportRowReq implements Serializable { */ @Schema(description = "物料编码") @NotBlank(message = "物料编码不能为空") - @Length(max = 255, message = "物料编码长度不能超过 {max} 个字符") + @Length(max = 64, message = "物料编码长度不能超过 {max} 个字符") private String encoding; + /** + * 打印编码(国产替代) + */ + @Schema(description = "打印编码(国产替代)") + @NotBlank(message = "打印编码(国产替代)不能为空") + @Length(max = 64, message = "打印编码(国产替代)长度不能超过 {max} 个字符") + private String encodingPrint; + /** * 物料单位重量(g) */ diff --git a/wms-module-system/src/main/java/top/wms/admin/material/model/req/MaterialInfoReq.java b/wms-module-system/src/main/java/top/wms/admin/material/model/req/MaterialInfoReq.java index 8ac95f6..e04c3ad 100644 --- a/wms-module-system/src/main/java/top/wms/admin/material/model/req/MaterialInfoReq.java +++ b/wms-module-system/src/main/java/top/wms/admin/material/model/req/MaterialInfoReq.java @@ -37,9 +37,16 @@ public class MaterialInfoReq implements Serializable { */ @Schema(description = "物料编码") @NotBlank(message = "物料编码不能为空") - @Length(max = 255, message = "物料编码长度不能超过 {max} 个字符") + @Length(max = 64, message = "物料编码长度不能超过 {max} 个字符") private String encoding; + /** + * 打印物料编码 + */ + @Schema(description = "打印编码(国产替代)") + @Length(max = 64, message = "打印编码(国产替代)长度不能超过 {max} 个字符") + private String encodingPrint; + /** * 物料单位重量(g) */ diff --git a/wms-module-system/src/main/java/top/wms/admin/material/model/resp/MaterialInfoResp.java b/wms-module-system/src/main/java/top/wms/admin/material/model/resp/MaterialInfoResp.java index b2f9f90..db255e7 100644 --- a/wms-module-system/src/main/java/top/wms/admin/material/model/resp/MaterialInfoResp.java +++ b/wms-module-system/src/main/java/top/wms/admin/material/model/resp/MaterialInfoResp.java @@ -36,6 +36,13 @@ public class MaterialInfoResp extends BaseDetailResp { @ExcelProperty(value = "物料编码", order = 2) private String encoding; + /** + * 打印物料编码 + */ + @Schema(description = "打印编码(国产替代)") + @ExcelProperty(value = "打印编码(国产替代)", order = 2) + private String encodingPrint; + /** * 物料单位重量(g) */ diff --git a/wms-module-system/src/main/java/top/wms/admin/material/service/impl/MaterialInfoServiceImpl.java b/wms-module-system/src/main/java/top/wms/admin/material/service/impl/MaterialInfoServiceImpl.java index c777ac7..99564ce 100644 --- a/wms-module-system/src/main/java/top/wms/admin/material/service/impl/MaterialInfoServiceImpl.java +++ b/wms-module-system/src/main/java/top/wms/admin/material/service/impl/MaterialInfoServiceImpl.java @@ -254,10 +254,12 @@ public class MaterialInfoServiceImpl extends BaseServiceImpl ELSE unit_weight END, + encoding_print = CASE + + + WHEN material_name = #{item.materialName} THEN #{item.encodingPrint} + + + ELSE encoding_print + END, update_user = CASE @@ -60,6 +68,14 @@ ELSE unit_weight END, + encoding_print = CASE + + + WHEN encoding = #{item.encoding} THEN #{item.encodingPrint} + + + ELSE encoding_print + END, update_user = CASE diff --git a/wms-webapi/src/main/resources/templates/import/materialInfo.xlsx b/wms-webapi/src/main/resources/templates/import/materialInfo.xlsx index 203a520..d08b436 100644 Binary files a/wms-webapi/src/main/resources/templates/import/materialInfo.xlsx and b/wms-webapi/src/main/resources/templates/import/materialInfo.xlsx differ