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 93360b7..4b4b713 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,12 +37,6 @@ 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 c89fe31..0b6cdf8 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,13 +45,6 @@ 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 2f9c022..dd13c84 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,12 +44,6 @@ 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/material/model/query/MaterialInfoQuery.java b/wms-module-system/src/main/java/top/wms/admin/material/model/query/MaterialInfoQuery.java index e70e410..b5b696f 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,13 +37,6 @@ 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 9347f62..41393ac 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 @@ -32,14 +32,6 @@ public class MaterialImportRowReq implements Serializable { @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 e04c3ad..e8fecb9 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 @@ -40,13 +40,6 @@ public class MaterialInfoReq implements Serializable { @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 db255e7..b2f9f90 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,13 +36,6 @@ 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 99564ce..c777ac7 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,12 +254,10 @@ 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 @@ -68,14 +60,6 @@ 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 d08b436..b73a4b9 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