From 2c7e05cbad2a7f19c155a9f40c2f9de3039e0d29 Mon Sep 17 00:00:00 2001 From: zc Date: Mon, 15 Jun 2026 15:36:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=B0=E7=BC=96=E7=A0=81=E9=9C=80?= =?UTF-8?q?=E6=B1=82=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/query/FullWorkOrderQuery.java | 6 ------ .../model/req/FullWorkOrderReq.java | 7 ------- .../model/resp/FullWorkOrderResp.java | 6 ------ .../model/query/MaterialInfoQuery.java | 7 ------- .../model/req/MaterialImportRowReq.java | 8 -------- .../material/model/req/MaterialInfoReq.java | 7 ------- .../material/model/resp/MaterialInfoResp.java | 7 ------- .../service/impl/MaterialInfoServiceImpl.java | 2 -- .../model/query/WorkOrderQuery.java | 6 ------ .../weighManage/model/req/WorkOrderReq.java | 7 ------- .../weighManage/model/resp/WorkOrderResp.java | 7 ------- .../service/impl/WorkOrderServiceImpl.java | 1 - .../resources/mapper/MeterialInfoMapper.xml | 16 ---------------- .../templates/import/materialInfo.xlsx | Bin 9507 -> 9456 bytes 14 files changed, 87 deletions(-) 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 d08b436132b83aee6aa790972504697ba0ca7c36..b73a4b9ebeeed3b1266db126f3f13ba5ecaca312 100644 GIT binary patch delta 2478 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 P%9F<=BL