打印编码需求变更

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;
-
     /**
      * 物料名称
      */

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;
-
     /**
      * /**
      * 图片地址

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;
-
     /**
      * 物料名称
      */

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;
-
     /**
      * 批次
      */

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)
      */

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)
      */

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)
      */

wms-module-system/src/main/java/top/wms/admin/material/service/impl/MaterialInfoServiceImpl.java

@@ -254,12 +254,10 @@ public class MaterialInfoServiceImpl extends BaseServiceImpl<MaterialInfoMapper,
             // 修改 or 新增
             if (UPDATE.validate(req.getDuplicateName(), row.getMaterialName(), existName)) {
                 materialDO.setMaterialName(row.getMaterialName());
-                materialDO.setEncodingPrint(row.getEncodingPrint());
                 materialDO.setUpdateUser(UserContextHolder.getUserId());
                 updateByNameList.add(materialDO);
             } else if (UPDATE.validate(req.getDuplicateCode(), row.getEncoding(), existCode)) {
                 materialDO.setEncoding(row.getEncoding());
-                materialDO.setEncodingPrint(row.getEncodingPrint());
                 materialDO.setUpdateUser(UserContextHolder.getUserId());
                 updateByCodeList.add(materialDO);
             } else {

wms-module-system/src/main/java/top/wms/admin/weighManage/model/query/WorkOrderQuery.java

@@ -41,12 +41,6 @@ public class WorkOrderQuery implements Serializable {
     @Schema(description = "物料编码")
     private String encoding;
 
-    /**
-     * 打印物料编码
-     */
-    @Schema(description = "打印编码（国产替代）")
-    private String encodingPrint;
-
     /**
      * 创建人
      */

wms-module-system/src/main/java/top/wms/admin/weighManage/model/req/WorkOrderReq.java

@@ -30,13 +30,6 @@ public class WorkOrderReq implements Serializable {
     @NotNull(message = "物料主键id不能为空")
     private Long materialId;
 
-    /**
-     * 打印物料编码
-     */
-    @Schema(description = "打印编码（国产替代）")
-    @NotBlank(message = "打印编码（国产替代）不能为空")
-    private String encodingPrint;
-
     /**
      * 称重列表
      */

wms-module-system/src/main/java/top/wms/admin/weighManage/model/resp/WorkOrderResp.java

@@ -68,13 +68,6 @@ public class WorkOrderResp extends BaseDetailResp {
     @ExcelProperty(value = "物料编码", order = 5)
     private String encoding;
 
-    /**
-     * 打印物料编码
-     */
-    @Schema(description = "打印物料编码")
-    @ExcelProperty(value = "打印物料编码", order = 5)
-    private String encodingPrint;
-
     /**
      * 物料单位重量
      */

wms-module-system/src/main/java/top/wms/admin/weighManage/service/impl/WorkOrderServiceImpl.java

@@ -183,7 +183,6 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
         workOrder.setTitle(title);
         workOrder.setMaterialId(req.getMaterialId());
         workOrder.setBatch(materialInfoDO.getBatch());
-        workOrder.setEncodingPrint(req.getEncodingPrint());
         workOrder.setMark(req.getWorkOrderInfos().get(0).getMark());
         workOrder.setTotalWeight(totalWeight);
         workOrder.setTotalCount(totalCount);

wms-module-system/src/main/resources/mapper/MeterialInfoMapper.xml

@@ -23,14 +23,6 @@
                     </foreach>
                     ELSE unit_weight
                 END,
-                encoding_print = CASE
-                    <foreach collection="list" item="item" separator="">
-                        <if test="item.encodingPrint != null and item.encodingPrint != ''">
-                            WHEN material_name = #{item.materialName} THEN #{item.encodingPrint}
-                        </if>
-                    </foreach>
-                    ELSE encoding_print
-                END,
                 update_user = CASE
                     <foreach collection="list" item="item" separator="">
                         <if test="item.updateUser != null">
@@ -68,14 +60,6 @@
                     </foreach>
                     ELSE unit_weight
                 END,
-                encoding_print = CASE
-                <foreach collection="list" item="item" separator="">
-                    <if test="item.encodingPrint != null and item.encodingPrint != ''">
-                        WHEN encoding = #{item.encoding} THEN #{item.encodingPrint}
-                    </if>
-                </foreach>
-                ELSE encoding_print
-                END,
                 update_user = CASE
                     <foreach collection="list" item="item" separator="">
                         <if test="item.updateUser != null">