Merge branch 'master' of git.picaiba.com:CaiXiang/cigs4 into yanyang

Reviewed-on: #40

ym-generator/src/main/java/com/cnbm/generator/code/controller/PrintModelController.java

@@ -31,7 +31,7 @@ import java.util.Map;
  * 打印标签模板表  前端控制器
  *
  * @author codeGenerator
- * @since  2023-12-22
+ * @since  2024-01-25
  */
 @RestController
 @RequestMapping("/code/printModel")

ym-generator/src/main/java/com/cnbm/generator/code/controller/ProductLevelController.java

@@ -31,7 +31,7 @@ import java.util.Map;
  * 产品等级 表  前端控制器
  *
  * @author codeGenerator
- * @since  2023-12-21
+ * @since  2023-12-28
  */
 @RestController
 @RequestMapping("/code/productLevel")

ym-generator/src/main/java/com/cnbm/generator/code/controller/ScenesController.java

@@ -31,7 +31,7 @@ import java.util.Map;
  * 场景 表  前端控制器
  *
  * @author codeGenerator
- * @since  2023-12-21
+ * @since  2023-12-28
  */
 @RestController
 @RequestMapping("/code/scenes")

ym-generator/src/main/java/com/cnbm/generator/code/controller/WoPackagingBoxController.java

@@ -31,7 +31,7 @@ import java.util.Map;
  * 包装箱表  前端控制器
  *
  * @author codeGenerator
- * @since  2023-02-23
+ * @since  2024-01-29
  */
 @RestController
 @RequestMapping("/code/woPackagingBox")

ym-generator/src/main/java/com/cnbm/generator/code/controller/WorkingTimeController.java

@@ -31,7 +31,7 @@ import java.util.Map;
  * 班次时间段 表  前端控制器
  *
  * @author codeGenerator
- * @since  2023-12-20
+ * @since  2023-12-28
  */
 @RestController
 @RequestMapping("/code/workingTime")

ym-generator/src/main/java/com/cnbm/generator/code/dto/PrintModelDTO.java

@@ -14,7 +14,7 @@ import java.math.BigDecimal;
  * 打印标签模板表
  *
  * @author codeGenerator
- * @since  2023-12-22
+ * @since  2024-01-25
  */
 @Data
 @ApiModel(value = "打印标签模板表DTO对象")
@@ -80,10 +80,19 @@ public class PrintModelDTO implements Serializable {
 	@ApiModelProperty(value = "是否启用，0 停用；1 启用")
 	private Integer isEnable;
 
-	@ApiModelProperty(value = "场景，前端传字符串过来，t_scenes 把value传过来放进去，不要放id")
+	@ApiModelProperty(value = "场景（用不着了，废弃）")
 	private String scenes;
 
-	@ApiModelProperty(value = "产品等级，t_product_level 把value传过来放进去，不要放id")
+	@ApiModelProperty(value = "产品等级，t_product_level 把code传过来放进去，不要放id")
 	private String productGrade;
 
+	@ApiModelProperty(value = "节数，前端写死，输入")
+	private String pitchNumber;
+
+	@ApiModelProperty(value = "产品等级，前端写死，输入")
+	private String maxFuseCurrent;
+
+	@ApiModelProperty(value = "产品等级，前端写死，输入")
+	private String coverName;
+
 }

ym-generator/src/main/java/com/cnbm/generator/code/dto/ProductLevelDTO.java

@@ -14,7 +14,7 @@ import java.math.BigDecimal;
  * 产品等级 表
  *
  * @author codeGenerator
- * @since  2023-12-21
+ * @since  2023-12-28
  */
 @Data
 @ApiModel(value = "产品等级 表DTO对象")
@@ -30,7 +30,7 @@ public class ProductLevelDTO implements Serializable {
 	private String productName;
 
 	@ApiModelProperty(value = "产品等级，A1/A2/A3/A4/NK")
-	private LocalDateTime productLevel;
+	private String productLevel;
 
 	@ApiModelProperty(value = "备注")
 	private String remark;
@@ -59,4 +59,7 @@ public class ProductLevelDTO implements Serializable {
 	@ApiModelProperty(value = "版本号")
 	private Integer version;
 
+	@ApiModelProperty(value = "产品等级代码")
+	private String code;
+
 }

ym-generator/src/main/java/com/cnbm/generator/code/dto/ScenesDTO.java

@@ -14,7 +14,7 @@ import java.math.BigDecimal;
  * 场景 表
  *
  * @author codeGenerator
- * @since  2023-12-21
+ * @since  2023-12-28
  */
 @Data
 @ApiModel(value = "场景 表DTO对象")
@@ -56,4 +56,7 @@ public class ScenesDTO implements Serializable {
 	@ApiModelProperty(value = "版本号")
 	private Integer version;
 
+	@ApiModelProperty(value = "场景code")
+	private String code;
+
 }

ym-generator/src/main/java/com/cnbm/generator/code/dto/WoPackagingBoxDTO.java

@@ -14,7 +14,7 @@ import java.math.BigDecimal;
  * 包装箱表
  *
  * @author codeGenerator
- * @since  2023-02-23
+ * @since  2024-01-29
  */
 @Data
 @ApiModel(value = "包装箱表DTO对象")
@@ -41,7 +41,7 @@ public class WoPackagingBoxDTO implements Serializable {
 	@ApiModelProperty(value = "等级（舍弃）")
 	private Integer grade;
 
-	@ApiModelProperty(value = "基板数量，每个包装箱最大20片（舍弃）")
+	@ApiModelProperty(value = "基板数量，每个包装箱最大20片")
 	private Integer substrateQuantity;
 
 	@ApiModelProperty(value = "装箱完成时间，指的是包装完成时间")
@@ -113,4 +113,16 @@ public class WoPackagingBoxDTO implements Serializable {
 	@ApiModelProperty(value = "订单号")
 	private String orderNum;
 
+	@ApiModelProperty(value = "产品等级，t_product_level 把code传过来放进去，不要放id")
+	private String productGrade;
+
+	@ApiModelProperty(value = "节数，前端写死，输入")
+	private String pitchNumber;
+
+	@ApiModelProperty(value = "最大额定熔断电流，前端写死，输入")
+	private String maxFuseCurrent;
+
+	@ApiModelProperty(value = "盖板，前端写死，输入")
+	private String coverName;
+
 }

ym-generator/src/main/java/com/cnbm/generator/code/dto/WorkingTimeDTO.java

@@ -14,7 +14,7 @@ import java.math.BigDecimal;
  * 班次时间段 表
  *
  * @author codeGenerator
- * @since  2023-12-20
+ * @since  2023-12-28
  */
 @Data
 @ApiModel(value = "班次时间段 表DTO对象")
@@ -62,4 +62,7 @@ public class WorkingTimeDTO implements Serializable {
 	@ApiModelProperty(value = "版本号")
 	private Integer version;
 
+	@ApiModelProperty(value = "班次代码")
+	private String code;
+
 }

ym-generator/src/main/java/com/cnbm/generator/code/entity/PrintModel.java

@@ -14,7 +14,7 @@ import lombok.Data;
  * </p>
  *
  * @author codeGenerator
- * @since 2023-12-22
+ * @since 2024-01-25
  */
 @Data
 @TableName("t_print_model")
@@ -81,12 +81,21 @@ public class PrintModel implements Serializable {
     @ApiModelProperty("是否启用，0 停用；1 启用")
     private Integer isEnable;
 
-    @ApiModelProperty("场景，前端传字符串过来，t_scenes 把value传过来放进去，不要放id")
+    @ApiModelProperty("场景（用不着了，废弃）")
     private String scenes;
 
-    @ApiModelProperty("产品等级，t_product_level 把value传过来放进去，不要放id")
+    @ApiModelProperty("产品等级，t_product_level 把code传过来放进去，不要放id")
     private String productGrade;
 
+    @ApiModelProperty("节数，前端写死，输入")
+    private String pitchNumber;
+
+    @ApiModelProperty("产品等级，前端写死，输入")
+    private String maxFuseCurrent;
+
+    @ApiModelProperty("产品等级，前端写死，输入")
+    private String coverName;
+
 
     public static final String ID = "ID";
 
@@ -130,4 +139,10 @@ public class PrintModel implements Serializable {
 
     public static final String PRODUCT_GRADE = "product_grade";
 
+    public static final String PITCH_NUMBER = "pitch_number";
+
+    public static final String MAX_FUSE_CURRENT = "max_fuse_current";
+
+    public static final String COVER_NAME = "cover_name";
+
 }

ym-generator/src/main/java/com/cnbm/generator/code/entity/ProductLevel.java

@@ -14,7 +14,7 @@ import lombok.Data;
  * </p>
  *
  * @author codeGenerator
- * @since 2023-12-21
+ * @since 2023-12-28
  */
 @Data
 @TableName("t_product_level")
@@ -30,7 +30,7 @@ public class ProductLevel implements Serializable {
     private String productName;
 
     @ApiModelProperty("产品等级，A1/A2/A3/A4/NK")
-    private LocalDateTime productLevel;
+    private String productLevel;
 
     @ApiModelProperty("备注")
     private String remark;
@@ -60,6 +60,9 @@ public class ProductLevel implements Serializable {
     @ApiModelProperty("版本号")
     private Integer version;
 
+    @ApiModelProperty("产品等级代码")
+    private String code;
+
 
     public static final String ID = "id";
 
@@ -85,4 +88,6 @@ public class ProductLevel implements Serializable {
 
     public static final String VERSION = "version";
 
+    public static final String CODE = "code";
+
 }

ym-generator/src/main/java/com/cnbm/generator/code/entity/Scenes.java

@@ -14,7 +14,7 @@ import lombok.Data;
  * </p>
  *
  * @author codeGenerator
- * @since 2023-12-21
+ * @since 2023-12-28
  */
 @Data
 @TableName("t_scenes")
@@ -57,6 +57,9 @@ public class Scenes implements Serializable {
     @ApiModelProperty("版本号")
     private Integer version;
 
+    @ApiModelProperty("场景code")
+    private String code;
+
 
     public static final String ID = "id";
 
@@ -80,4 +83,6 @@ public class Scenes implements Serializable {
 
     public static final String VERSION = "version";
 
+    public static final String CODE = "code";
+
 }

ym-generator/src/main/java/com/cnbm/generator/code/entity/WoPackagingBox.java

@@ -14,7 +14,7 @@ import lombok.Data;
  * </p>
  *
  * @author codeGenerator
- * @since 2023-02-23
+ * @since 2024-01-29
  */
 @Data
 @TableName("t_wo_packaging_box")
@@ -41,7 +41,7 @@ public class WoPackagingBox implements Serializable {
     @ApiModelProperty("等级（舍弃）")
     private Integer grade;
 
-    @ApiModelProperty("基板数量，每个包装箱最大20片（舍弃）")
+    @ApiModelProperty("基板数量，每个包装箱最大20片")
     private Integer substrateQuantity;
 
     @ApiModelProperty("装箱完成时间，指的是包装完成时间")
@@ -114,6 +114,18 @@ public class WoPackagingBox implements Serializable {
     @ApiModelProperty("订单号")
     private String orderNum;
 
+    @ApiModelProperty("产品等级，t_product_level 把code传过来放进去，不要放id")
+    private String productGrade;
+
+    @ApiModelProperty("节数，前端写死，输入")
+    private String pitchNumber;
+
+    @ApiModelProperty("最大额定熔断电流，前端写死，输入")
+    private String maxFuseCurrent;
+
+    @ApiModelProperty("盖板，前端写死，输入")
+    private String coverName;
+
 
     public static final String ID = "ID";
 
@@ -175,4 +187,12 @@ public class WoPackagingBox implements Serializable {
 
     public static final String ORDER_NUM = "ORDER_NUM";
 
+    public static final String PRODUCT_GRADE = "product_grade";
+
+    public static final String PITCH_NUMBER = "pitch_number";
+
+    public static final String MAX_FUSE_CURRENT = "max_fuse_current";
+
+    public static final String COVER_NAME = "cover_name";
+
 }

ym-generator/src/main/java/com/cnbm/generator/code/entity/WorkingTime.java

@@ -14,7 +14,7 @@ import lombok.Data;
  * </p>
  *
  * @author codeGenerator
- * @since 2023-12-20
+ * @since 2023-12-28
  */
 @Data
 @TableName("t_working_time")
@@ -63,6 +63,9 @@ public class WorkingTime implements Serializable {
     @ApiModelProperty("版本号")
     private Integer version;
 
+    @ApiModelProperty("班次代码")
+    private String code;
+
 
     public static final String ID = "id";
 
@@ -90,4 +93,6 @@ public class WorkingTime implements Serializable {
 
     public static final String VERSION = "version";
 
+    public static final String CODE = "code";
+
 }

ym-generator/src/main/java/com/cnbm/generator/code/excel/PrintModelExcel.java

@@ -12,7 +12,7 @@ import java.util.Date;
  * 打印标签模板表
  *
  * @author codeGenerator
- * @since  2023-12-22
+ * @since  2024-01-25
  */
 @Data
 public class PrintModelExcel {
@@ -54,9 +54,15 @@ public class PrintModelExcel {
     private Integer lineBody;
     @Excel(name = "是否启用，0 停用；1 启用")
     private Integer isEnable;
-    @Excel(name = "场景，前端传字符串过来，t_scenes 把value传过来放进去，不要放id")
+    @Excel(name = "场景（用不着了，废弃）")
     private String scenes;
-    @Excel(name = "产品等级，t_product_level 把value传过来放进去，不要放id")
+    @Excel(name = "产品等级，t_product_level 把code传过来放进去，不要放id")
     private String productGrade;
+    @Excel(name = "节数，前端写死，输入")
+    private String pitchNumber;
+    @Excel(name = "产品等级，前端写死，输入")
+    private String maxFuseCurrent;
+    @Excel(name = "产品等级，前端写死，输入")
+    private String coverName;
 
 }

ym-generator/src/main/java/com/cnbm/generator/code/excel/ProductLevelExcel.java

@@ -12,7 +12,7 @@ import java.util.Date;
  * 产品等级 表
  *
  * @author codeGenerator
- * @since  2023-12-21
+ * @since  2023-12-28
  */
 @Data
 public class ProductLevelExcel {
@@ -21,7 +21,7 @@ public class ProductLevelExcel {
     @Excel(name = "产品名")
     private String productName;
     @Excel(name = "产品等级，A1/A2/A3/A4/NK")
-    private LocalDateTime productLevel;
+    private String productLevel;
     @Excel(name = "备注")
     private String remark;
     @Excel(name = "删除标志，是否有效:1 可用 0不可用")
@@ -40,5 +40,7 @@ public class ProductLevelExcel {
     private LocalDateTime updateTime;
     @Excel(name = "版本号")
     private Integer version;
+    @Excel(name = "产品等级代码")
+    private String code;
 
 }

ym-generator/src/main/java/com/cnbm/generator/code/excel/ScenesExcel.java

@@ -12,7 +12,7 @@ import java.util.Date;
  * 场景 表
  *
  * @author codeGenerator
- * @since  2023-12-21
+ * @since  2023-12-28
  */
 @Data
 public class ScenesExcel {
@@ -38,5 +38,7 @@ public class ScenesExcel {
     private LocalDateTime updateTime;
     @Excel(name = "版本号")
     private Integer version;
+    @Excel(name = "场景code")
+    private String code;
 
 }

ym-generator/src/main/java/com/cnbm/generator/code/excel/WoPackagingBoxExcel.java

@@ -12,7 +12,7 @@ import java.util.Date;
  * 包装箱表
  *
  * @author codeGenerator
- * @since  2023-02-23
+ * @since  2024-01-29
  */
 @Data
 public class WoPackagingBoxExcel {
@@ -28,7 +28,7 @@ public class WoPackagingBoxExcel {
     private Integer power;
     @Excel(name = "等级（舍弃）")
     private Integer grade;
-    @Excel(name = "基板数量，每个包装箱最大20片（舍弃）")
+    @Excel(name = "基板数量，每个包装箱最大20片")
     private Integer substrateQuantity;
     @Excel(name = "装箱完成时间，指的是包装完成时间")
     private LocalDateTime packagingTime;
@@ -76,5 +76,13 @@ public class WoPackagingBoxExcel {
     private Integer isArrived;
     @Excel(name = "订单号")
     private String orderNum;
+    @Excel(name = "产品等级，t_product_level 把code传过来放进去，不要放id")
+    private String productGrade;
+    @Excel(name = "节数，前端写死，输入")
+    private String pitchNumber;
+    @Excel(name = "最大额定熔断电流，前端写死，输入")
+    private String maxFuseCurrent;
+    @Excel(name = "盖板，前端写死，输入")
+    private String coverName;
 
 }

ym-generator/src/main/java/com/cnbm/generator/code/excel/WorkingTimeExcel.java

@@ -12,7 +12,7 @@ import java.util.Date;
  * 班次时间段 表
  *
  * @author codeGenerator
- * @since  2023-12-20
+ * @since  2023-12-28
  */
 @Data
 public class WorkingTimeExcel {
@@ -42,5 +42,7 @@ public class WorkingTimeExcel {
     private LocalDateTime updateTime;
     @Excel(name = "版本号")
     private Integer version;
+    @Excel(name = "班次代码")
+    private String code;
 
 }

ym-generator/src/main/java/com/cnbm/generator/code/mapper/PrintModelMapper.java

@@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper;
  * 打印标签模板表
  *
  * @author codeGenerator
- * @since 2023-12-22
+ * @since 2024-01-25
  */
 @Mapper
 public interface PrintModelMapper extends BaseDao<PrintModel> {

ym-generator/src/main/java/com/cnbm/generator/code/mapper/PrintModelMapper.xml

@@ -23,6 +23,9 @@
             <id column="is_enable" property="isEnable" />
             <id column="scenes" property="scenes" />
             <id column="product_grade" property="productGrade" />
+            <id column="pitch_number" property="pitchNumber" />
+            <id column="max_fuse_current" property="maxFuseCurrent" />
+            <id column="cover_name" property="coverName" />
     </resultMap>
 
 </mapper>

ym-generator/src/main/java/com/cnbm/generator/code/mapper/ProductLevelMapper.java

@@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper;
  * 产品等级 表
  *
  * @author codeGenerator
- * @since 2023-12-21
+ * @since 2023-12-28
  */
 @Mapper
 public interface ProductLevelMapper extends BaseDao<ProductLevel> {

ym-generator/src/main/java/com/cnbm/generator/code/mapper/ProductLevelMapper.xml

@@ -14,6 +14,7 @@
             <id column="updater_name" property="updaterName" />
             <id column="update_time" property="updateTime" />
             <id column="version" property="version" />
+            <id column="code" property="code" />
     </resultMap>
 
 </mapper>

ym-generator/src/main/java/com/cnbm/generator/code/mapper/ScenesMapper.java

@@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper;
  * 场景 表
  *
  * @author codeGenerator
- * @since 2023-12-21
+ * @since 2023-12-28
  */
 @Mapper
 public interface ScenesMapper extends BaseDao<Scenes> {

ym-generator/src/main/java/com/cnbm/generator/code/mapper/ScenesMapper.xml

@@ -13,6 +13,7 @@
             <id column="updater_name" property="updaterName" />
             <id column="update_time" property="updateTime" />
             <id column="version" property="version" />
+            <id column="code" property="code" />
     </resultMap>
 
 </mapper>

ym-generator/src/main/java/com/cnbm/generator/code/mapper/WoPackagingBoxMapper.java

@@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper;
  * 包装箱表
  *
  * @author codeGenerator
- * @since 2023-02-23
+ * @since 2024-01-29
  */
 @Mapper
 public interface WoPackagingBoxMapper extends BaseDao<WoPackagingBox> {

ym-generator/src/main/java/com/cnbm/generator/code/mapper/WoPackagingBoxMapper.xml

@@ -32,6 +32,10 @@
             <id column="model" property="model" />
             <id column="is_arrived" property="isArrived" />
             <id column="ORDER_NUM" property="orderNum" />
+            <id column="product_grade" property="productGrade" />
+            <id column="pitch_number" property="pitchNumber" />
+            <id column="max_fuse_current" property="maxFuseCurrent" />
+            <id column="cover_name" property="coverName" />
     </resultMap>
 
 </mapper>

ym-generator/src/main/java/com/cnbm/generator/code/mapper/WorkingTimeMapper.java

@@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper;
  * 班次时间段 表
  *
  * @author codeGenerator
- * @since 2023-12-20
+ * @since 2023-12-28
  */
 @Mapper
 public interface WorkingTimeMapper extends BaseDao<WorkingTime> {

ym-generator/src/main/java/com/cnbm/generator/code/mapper/WorkingTimeMapper.xml

@@ -15,6 +15,7 @@
             <id column="updater_name" property="updaterName" />
             <id column="update_time" property="updateTime" />
             <id column="version" property="version" />
+            <id column="code" property="code" />
     </resultMap>
 
 </mapper>

ym-generator/src/main/java/com/cnbm/generator/code/mysql/PrintModelmysql.sql

@@ -1,7 +1,7 @@
 -- 菜单初始SQL
-INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date)VALUES (1738098359422767105, 1067246875800000035, '打印标签模板表', 'code/printModel', NULL, 0, 'icon-desktop', 0, 1067246875800000001, now(), 1067246875800000001, now());
-INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1738098359422767106, 1738098359422767105, '查看', NULL, 'code:printModel:page,code:printModel:info', 1, NULL, 0, 1067246875800000001, now(), 1067246875800000001, now());
-INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1738098359422767107, 1738098359422767105, '新增', NULL, 'code:printModel:save', 1, NULL, 1, 1067246875800000001, now(), 1067246875800000001, now());
-INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1738098359422767108, 1738098359422767105, '修改', NULL, 'code:printModel:update', 1, NULL, 2, 1067246875800000001, now(), 1067246875800000001, now());
-INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1738098359422767109, 1738098359422767105, '删除', NULL, 'code:printModel:delete', 1, NULL, 3, 1067246875800000001, now(), 1067246875800000001, now());
-INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1738098359422767110, 1738098359422767105, '导出', NULL, 'code:printModel:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date)VALUES (1750401797217132546, 1067246875800000035, '打印标签模板表', 'code/printModel', NULL, 0, 'icon-desktop', 0, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1750401797217132547, 1750401797217132546, '查看', NULL, 'code:printModel:page,code:printModel:info', 1, NULL, 0, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1750401797217132548, 1750401797217132546, '新增', NULL, 'code:printModel:save', 1, NULL, 1, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1750401797217132549, 1750401797217132546, '修改', NULL, 'code:printModel:update', 1, NULL, 2, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1750401797217132550, 1750401797217132546, '删除', NULL, 'code:printModel:delete', 1, NULL, 3, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1750401797217132551, 1750401797217132546, '导出', NULL, 'code:printModel:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now());

ym-generator/src/main/java/com/cnbm/generator/code/mysql/ProductLevelmysql.sql

@@ -1,7 +1,7 @@
 -- 菜单初始SQL
-INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date)VALUES (1737669381515964417, 1067246875800000035, '产品等级 表', 'basic/productLevel', NULL, 0, 'icon-desktop', 0, 1067246875800000001, now(), 1067246875800000001, now());
-INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1737669381515964418, 1737669381515964417, '查看', NULL, 'basic:productLevel:page,basic:productLevel:info', 1, NULL, 0, 1067246875800000001, now(), 1067246875800000001, now());
-INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1737669381515964419, 1737669381515964417, '新增', NULL, 'basic:productLevel:save', 1, NULL, 1, 1067246875800000001, now(), 1067246875800000001, now());
-INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1737669381515964420, 1737669381515964417, '修改', NULL, 'basic:productLevel:update', 1, NULL, 2, 1067246875800000001, now(), 1067246875800000001, now());
-INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1737669381515964421, 1737669381515964417, '删除', NULL, 'basic:productLevel:delete', 1, NULL, 3, 1067246875800000001, now(), 1067246875800000001, now());
-INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1737669381515964422, 1737669381515964417, '导出', NULL, 'basic:productLevel:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date)VALUES (1740170405581496322, 1067246875800000035, '产品等级 表', 'code/productLevel', NULL, 0, 'icon-desktop', 0, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1740170405581496323, 1740170405581496322, '查看', NULL, 'code:productLevel:page,code:productLevel:info', 1, NULL, 0, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1740170405581496324, 1740170405581496322, '新增', NULL, 'code:productLevel:save', 1, NULL, 1, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1740170405581496325, 1740170405581496322, '修改', NULL, 'code:productLevel:update', 1, NULL, 2, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1740170405581496326, 1740170405581496322, '删除', NULL, 'code:productLevel:delete', 1, NULL, 3, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1740170405581496327, 1740170405581496322, '导出', NULL, 'code:productLevel:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now());

ym-generator/src/main/java/com/cnbm/generator/code/mysql/Scenesmysql.sql

@@ -1,7 +1,7 @@
 -- 菜单初始SQL
-INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date)VALUES (1737669220261810177, 1067246875800000035, '场景 表', 'code/scenes', NULL, 0, 'icon-desktop', 0, 1067246875800000001, now(), 1067246875800000001, now());
-INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1737669220261810178, 1737669220261810177, '查看', NULL, 'code:scenes:page,code:scenes:info', 1, NULL, 0, 1067246875800000001, now(), 1067246875800000001, now());
-INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1737669220261810179, 1737669220261810177, '新增', NULL, 'code:scenes:save', 1, NULL, 1, 1067246875800000001, now(), 1067246875800000001, now());
-INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1737669220261810180, 1737669220261810177, '修改', NULL, 'code:scenes:update', 1, NULL, 2, 1067246875800000001, now(), 1067246875800000001, now());
-INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1737669220261810181, 1737669220261810177, '删除', NULL, 'code:scenes:delete', 1, NULL, 3, 1067246875800000001, now(), 1067246875800000001, now());
-INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1737669220261810182, 1737669220261810177, '导出', NULL, 'code:scenes:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date)VALUES (1740173054175444994, 1067246875800000035, '场景 表', 'code/scenes', NULL, 0, 'icon-desktop', 0, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1740173054175444995, 1740173054175444994, '查看', NULL, 'code:scenes:page,code:scenes:info', 1, NULL, 0, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1740173054175444996, 1740173054175444994, '新增', NULL, 'code:scenes:save', 1, NULL, 1, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1740173054175444997, 1740173054175444994, '修改', NULL, 'code:scenes:update', 1, NULL, 2, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1740173054175444998, 1740173054175444994, '删除', NULL, 'code:scenes:delete', 1, NULL, 3, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1740173054175444999, 1740173054175444994, '导出', NULL, 'code:scenes:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now());

ym-generator/src/main/java/com/cnbm/generator/code/mysql/WoPackagingBoxmysql.sql

@@ -1,7 +1,7 @@
 -- 菜单初始SQL
-INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date)VALUES (1628589985438695426, 1067246875800000035, '包装箱表', 'code/woPackagingBox', NULL, 0, 'icon-desktop', 0, 1067246875800000001, now(), 1067246875800000001, now());
-INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1628589985438695427, 1628589985438695426, '查看', NULL, 'code:woPackagingBox:page,code:woPackagingBox:info', 1, NULL, 0, 1067246875800000001, now(), 1067246875800000001, now());
-INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1628589985438695428, 1628589985438695426, '新增', NULL, 'code:woPackagingBox:save', 1, NULL, 1, 1067246875800000001, now(), 1067246875800000001, now());
-INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1628589985438695429, 1628589985438695426, '修改', NULL, 'code:woPackagingBox:update', 1, NULL, 2, 1067246875800000001, now(), 1067246875800000001, now());
-INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1628589985438695430, 1628589985438695426, '删除', NULL, 'code:woPackagingBox:delete', 1, NULL, 3, 1067246875800000001, now(), 1067246875800000001, now());
-INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1628589985438695431, 1628589985438695426, '导出', NULL, 'code:woPackagingBox:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date)VALUES (1751843769903550465, 1067246875800000035, '包装箱表', 'code/woPackagingBox', NULL, 0, 'icon-desktop', 0, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1751843769903550466, 1751843769903550465, '查看', NULL, 'code:woPackagingBox:page,code:woPackagingBox:info', 1, NULL, 0, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1751843769903550467, 1751843769903550465, '新增', NULL, 'code:woPackagingBox:save', 1, NULL, 1, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1751843769903550468, 1751843769903550465, '修改', NULL, 'code:woPackagingBox:update', 1, NULL, 2, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1751843769903550469, 1751843769903550465, '删除', NULL, 'code:woPackagingBox:delete', 1, NULL, 3, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1751843769903550470, 1751843769903550465, '导出', NULL, 'code:woPackagingBox:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now());

ym-generator/src/main/java/com/cnbm/generator/code/mysql/WorkingTimemysql.sql

@@ -1,7 +1,7 @@
 -- 菜单初始SQL
-INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date)VALUES (1737360876993064962, 1067246875800000035, '班次时间段 表', 'code/workingTime', NULL, 0, 'icon-desktop', 0, 1067246875800000001, now(), 1067246875800000001, now());
-INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1737360876993064963, 1737360876993064962, '查看', NULL, 'code:workingTime:page,code:workingTime:info', 1, NULL, 0, 1067246875800000001, now(), 1067246875800000001, now());
-INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1737360876993064964, 1737360876993064962, '新增', NULL, 'code:workingTime:save', 1, NULL, 1, 1067246875800000001, now(), 1067246875800000001, now());
-INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1737360876993064965, 1737360876993064962, '修改', NULL, 'code:workingTime:update', 1, NULL, 2, 1067246875800000001, now(), 1067246875800000001, now());
-INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1737360876993064966, 1737360876993064962, '删除', NULL, 'code:workingTime:delete', 1, NULL, 3, 1067246875800000001, now(), 1067246875800000001, now());
-INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1737360876993064967, 1737360876993064962, '导出', NULL, 'code:workingTime:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date)VALUES (1740170256717230082, 1067246875800000035, '班次时间段 表', 'code/workingTime', NULL, 0, 'icon-desktop', 0, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1740170256717230083, 1740170256717230082, '查看', NULL, 'code:workingTime:page,code:workingTime:info', 1, NULL, 0, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1740170256717230084, 1740170256717230082, '新增', NULL, 'code:workingTime:save', 1, NULL, 1, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1740170256717230085, 1740170256717230082, '修改', NULL, 'code:workingTime:update', 1, NULL, 2, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1740170256717230086, 1740170256717230082, '删除', NULL, 'code:workingTime:delete', 1, NULL, 3, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1740170256717230087, 1740170256717230082, '导出', NULL, 'code:workingTime:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now());

ym-generator/src/main/java/com/cnbm/generator/code/service/PrintModelServiceBiz.java

@@ -8,7 +8,7 @@ import com.cnbm.generator.code.entity.PrintModel;
  * 打印标签模板表
  *
  * @author codeGenerator
- * @since  2023-12-22
+ * @since  2024-01-25
  */
 public interface PrintModelServiceBiz extends CrudService<PrintModel, PrintModelDTO> {
 

ym-generator/src/main/java/com/cnbm/generator/code/service/ProductLevelServiceBiz.java

@@ -8,7 +8,7 @@ import com.cnbm.generator.code.entity.ProductLevel;
  * 产品等级 表
  *
  * @author codeGenerator
- * @since  2023-12-21
+ * @since  2023-12-28
  */
 public interface ProductLevelServiceBiz extends CrudService<ProductLevel, ProductLevelDTO> {
 

ym-generator/src/main/java/com/cnbm/generator/code/service/ScenesServiceBiz.java

@@ -8,7 +8,7 @@ import com.cnbm.generator.code.entity.Scenes;
  * 场景 表
  *
  * @author codeGenerator
- * @since  2023-12-21
+ * @since  2023-12-28
  */
 public interface ScenesServiceBiz extends CrudService<Scenes, ScenesDTO> {
 

ym-generator/src/main/java/com/cnbm/generator/code/service/WoPackagingBoxServiceBiz.java

@@ -8,7 +8,7 @@ import com.cnbm.generator.code.entity.WoPackagingBox;
  * 包装箱表
  *
  * @author codeGenerator
- * @since  2023-02-23
+ * @since  2024-01-29
  */
 public interface WoPackagingBoxServiceBiz extends CrudService<WoPackagingBox, WoPackagingBoxDTO> {
 

ym-generator/src/main/java/com/cnbm/generator/code/service/WorkingTimeServiceBiz.java

@@ -8,7 +8,7 @@ import com.cnbm.generator.code.entity.WorkingTime;
  * 班次时间段 表
  *
  * @author codeGenerator
- * @since  2023-12-20
+ * @since  2023-12-28
  */
 public interface WorkingTimeServiceBiz extends CrudService<WorkingTime, WorkingTimeDTO> {
 

ym-generator/src/main/java/com/cnbm/generator/code/service/impl/PrintModelServiceBizImpl.java

@@ -15,7 +15,7 @@ import java.util.Map;
  * 打印标签模板表
  *
  * @author codeGenerator
- * @since 2023-12-22
+ * @since 2024-01-25
  */
 @Service
 public class PrintModelServiceBizImpl extends CrudServiceImpl<PrintModelMapper, PrintModel, PrintModelDTO> implements PrintModelServiceBiz {

ym-generator/src/main/java/com/cnbm/generator/code/service/impl/ProductLevelServiceBizImpl.java

@@ -15,7 +15,7 @@ import java.util.Map;
  * 产品等级 表
  *
  * @author codeGenerator
- * @since 2023-12-21
+ * @since 2023-12-28
  */
 @Service
 public class ProductLevelServiceBizImpl extends CrudServiceImpl<ProductLevelMapper, ProductLevel, ProductLevelDTO> implements ProductLevelServiceBiz {

ym-generator/src/main/java/com/cnbm/generator/code/service/impl/ScenesServiceBizImpl.java

@@ -15,7 +15,7 @@ import java.util.Map;
  * 场景 表
  *
  * @author codeGenerator
- * @since 2023-12-21
+ * @since 2023-12-28
  */
 @Service
 public class ScenesServiceBizImpl extends CrudServiceImpl<ScenesMapper, Scenes, ScenesDTO> implements ScenesServiceBiz {

ym-generator/src/main/java/com/cnbm/generator/code/service/impl/WoPackagingBoxServiceBizImpl.java

@@ -15,7 +15,7 @@ import java.util.Map;
  * 包装箱表
  *
  * @author codeGenerator
- * @since 2023-02-23
+ * @since 2024-01-29
  */
 @Service
 public class WoPackagingBoxServiceBizImpl extends CrudServiceImpl<WoPackagingBoxMapper, WoPackagingBox, WoPackagingBoxDTO> implements WoPackagingBoxServiceBiz {

ym-generator/src/main/java/com/cnbm/generator/code/service/impl/WorkingTimeServiceBizImpl.java

@@ -15,7 +15,7 @@ import java.util.Map;
  * 班次时间段 表
  *
  * @author codeGenerator
- * @since 2023-12-20
+ * @since 2023-12-28
  */
 @Service
 public class WorkingTimeServiceBizImpl extends CrudServiceImpl<WorkingTimeMapper, WorkingTime, WorkingTimeDTO> implements WorkingTimeServiceBiz {

ym-packing/src/main/java/com/cnbm/packing/controller/ProductLevelController.java

@@ -1,5 +1,6 @@
 package com.cnbm.packing.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.cnbm.admin.annotation.LogOperation;
 import com.cnbm.common.constant.Constant;
 import com.cnbm.common.page.PageData;
@@ -10,8 +11,11 @@ import com.cnbm.common.validator.ValidatorUtils;
 import com.cnbm.common.validator.group.AddGroup;
 import com.cnbm.common.validator.group.DefaultGroup;
 import com.cnbm.common.validator.group.UpdateGroup;
+import com.cnbm.packing.dto.IdVo;
 import com.cnbm.packing.dto.ProductLevelDTO;
+import com.cnbm.packing.entity.ProductLevel;
 import com.cnbm.packing.excel.ProductLevelExcel;
+import com.cnbm.packing.mapper.ProductLevelMapper;
 import com.cnbm.packing.service.ProductLevelServiceBiz;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -39,6 +43,8 @@ import java.util.Map;
 public class ProductLevelController {
     @Autowired
     private ProductLevelServiceBiz productLevelService;
+    @Autowired
+    private ProductLevelMapper productLevelMapper;
 
     @GetMapping("page")
     @ApiOperation("分页")
@@ -46,9 +52,10 @@ public class ProductLevelController {
         @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataTypeClass=Integer.class) ,
         @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataTypeClass=Integer.class) ,
         @ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataTypeClass=String.class) ,
-        @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class)
+        @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class),
+        @ApiImplicitParam(name = "name", value = "产品等级名", paramType = "query", dataTypeClass = String.class)
     })
-    @PreAuthorize("@ex.hasAuthority('basic:productLevel:page')")
+//    @PreAuthorize("@ex.hasAuthority('basic:productLevel:page')")
     public Result<PageData<ProductLevelDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
         PageData<ProductLevelDTO> page = productLevelService.page(params);
 
@@ -57,7 +64,7 @@ public class ProductLevelController {
 
     @GetMapping("{id}")
     @ApiOperation("信息")
-    @PreAuthorize("@ex.hasAuthority('basic:productLevel:info')")
+//    @PreAuthorize("@ex.hasAuthority('basic:productLevel:info')")
     public Result<ProductLevelDTO> get(@PathVariable("id") Long id){
         ProductLevelDTO data = productLevelService.get(id);
 
@@ -67,33 +74,58 @@ public class ProductLevelController {
     @PostMapping
     @ApiOperation("保存")
     @LogOperation("保存")
-    @PreAuthorize("@ex.hasAuthority('basic:productLevel:save')")
-    public Result<Long> save(@RequestBody ProductLevelDTO dto){
+//    @PreAuthorize("@ex.hasAuthority('basic:productLevel:save')")
+    public Result<IdVo> save(@RequestBody ProductLevelDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
 
-        productLevelService.save(dto);
-
-        return new Result<Long>().ok(dto.getId());
+//        //验证编码是否重名
+//        QueryWrapper<ProductLevel> wrapper1 = new QueryWrapper<>();
+//        wrapper1.eq(ProductLevel.CODE, dto.getCode());
+//        if(productLevelMapper.selectCount(wrapper1)!= 0){
+//            return new Result().error(1,"编码重复");
+//        }
+        //验证名称是否重名
+        QueryWrapper<ProductLevel> wrapper2 = new QueryWrapper<>();
+        wrapper2.eq(ProductLevel.PRODUCT_LEVEL, dto.getProductLevel());
+        if(productLevelMapper.selectCount(wrapper2)!= 0){
+            return new Result().error(1,"名称重复");
+        }
+        else {
+            return new Result<IdVo>().ok(productLevelService.add(dto));
+        }
     }
 
     @PutMapping
     @ApiOperation("修改")
     @LogOperation("修改")
-    @PreAuthorize("@ex.hasAuthority('basic:productLevel:update')")
-    public Result<Long> update(@RequestBody ProductLevelDTO dto){
+//    @PreAuthorize("@ex.hasAuthority('basic:productLevel:update')")
+    public Result<IdVo> update(@RequestBody ProductLevelDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
 
-        productLevelService.update(dto);
-
-        return new Result<Long>().ok(dto.getId());
+        //验证编码是否重名
+        ProductLevelDTO entity = productLevelService.get(dto.getId());
+        QueryWrapper<ProductLevel> wrapper1 = new QueryWrapper<>();
+        wrapper1.eq(ProductLevel.CODE, dto.getCode());
+        if(!entity.getCode().equals(dto.getCode()) && productLevelMapper.selectCount(wrapper1)!= 0){
+            return new Result().error(1,"编码重复");
+        }
+        //验证名称是否重名
+        QueryWrapper<ProductLevel> wrapper2 = new QueryWrapper<>();
+        wrapper2.eq(ProductLevel.PRODUCT_LEVEL, dto.getProductLevel());
+        if(!entity.getProductLevel().equals(dto.getProductLevel()) && productLevelMapper.selectCount(wrapper2)!= 0){
+            return new Result().error(1,"名称重复");
+        }
+        else {
+            return new Result<IdVo>().ok(productLevelService.edit(dto));
+        }
     }
 
     @DeleteMapping
     @ApiOperation("删除")
     @LogOperation("删除")
-    @PreAuthorize("@ex.hasAuthority('basic:productLevel:delete')")
+//    @PreAuthorize("@ex.hasAuthority('basic:productLevel:delete')")
     public Result delete(@RequestBody Long[] ids){
         //效验数据
         AssertUtils.isArrayEmpty(ids, "id");
@@ -106,11 +138,16 @@ public class ProductLevelController {
     @GetMapping("export")
     @ApiOperation("导出")
     @LogOperation("导出")
-    @PreAuthorize("@ex.hasAuthority('basic:productLevel:export')")
+//    @PreAuthorize("@ex.hasAuthority('basic:productLevel:export')")
     public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
         List<ProductLevelDTO> list = productLevelService.list(params);
 
         ExcelUtils.exportExcelToTarget(response, null, list, ProductLevelExcel.class);
     }
 
+    @PostMapping(value = "list")
+    @ApiOperation(value = "获取产品等级列表")
+    public List<ProductLevelDTO> list(){
+        return productLevelService.list();
+    }
 }

ym-packing/src/main/java/com/cnbm/packing/controller/ScenesController.java

@@ -1,5 +1,6 @@
 package com.cnbm.packing.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.cnbm.admin.annotation.LogOperation;
 import com.cnbm.common.constant.Constant;
 import com.cnbm.common.page.PageData;
@@ -10,8 +11,11 @@ import com.cnbm.common.validator.ValidatorUtils;
 import com.cnbm.common.validator.group.AddGroup;
 import com.cnbm.common.validator.group.DefaultGroup;
 import com.cnbm.common.validator.group.UpdateGroup;
+import com.cnbm.packing.dto.IdVo;
 import com.cnbm.packing.dto.ScenesDTO;
+import com.cnbm.packing.entity.Scenes;
 import com.cnbm.packing.excel.ScenesExcel;
+import com.cnbm.packing.mapper.ScenesMapper;
 import com.cnbm.packing.service.ScenesServiceBiz;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -39,6 +43,8 @@ import java.util.Map;
 public class ScenesController {
     @Autowired
     private ScenesServiceBiz scenesService;
+    @Autowired
+    private ScenesMapper scenesMapper;
 
     @GetMapping("page")
     @ApiOperation("分页")
@@ -46,9 +52,10 @@ public class ScenesController {
         @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataTypeClass=Integer.class) ,
         @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataTypeClass=Integer.class) ,
         @ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataTypeClass=String.class) ,
-        @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class)
+        @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class),
+        @ApiImplicitParam(name = "name", value = "场景名", paramType = "query", dataTypeClass = String.class)
     })
-    @PreAuthorize("@ex.hasAuthority('basic:scenes:page')")
+//    @PreAuthorize("@ex.hasAuthority('basic:scenes:page')")
     public Result<PageData<ScenesDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
         PageData<ScenesDTO> page = scenesService.page(params);
 
@@ -57,7 +64,7 @@ public class ScenesController {
 
     @GetMapping("{id}")
     @ApiOperation("信息")
-    @PreAuthorize("@ex.hasAuthority('basic:scenes:info')")
+//    @PreAuthorize("@ex.hasAuthority('basic:scenes:info')")
     public Result<ScenesDTO> get(@PathVariable("id") Long id){
         ScenesDTO data = scenesService.get(id);
 
@@ -67,33 +74,60 @@ public class ScenesController {
     @PostMapping
     @ApiOperation("保存")
     @LogOperation("保存")
-    @PreAuthorize("@ex.hasAuthority('basic:scenes:save')")
-    public Result<Long> save(@RequestBody ScenesDTO dto){
+//    @PreAuthorize("@ex.hasAuthority('basic:scenes:save')")
+    public Result<IdVo> save(@RequestBody ScenesDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
 
-        scenesService.save(dto);
-
-        return new Result<Long>().ok(dto.getId());
+        //验证编码是否重名
+        QueryWrapper<Scenes> wrapper1 = new QueryWrapper<>();
+        wrapper1.eq(Scenes.CODE, dto.getCode());
+        if(scenesMapper.selectCount(wrapper1)!= 0){
+            return new Result().error(1,"编码重复");
+        }
+        //验证名称是否重名
+        QueryWrapper<Scenes> wrapper2 = new QueryWrapper<>();
+        wrapper2.eq(Scenes.SCENES_NAME, dto.getScenesName());
+        System.out.println(scenesMapper.selectCount(wrapper2));
+        if(scenesMapper.selectCount(wrapper2)!= 0){
+            return new Result().error(1,"名称重复");
+        }
+        else {
+            return new Result<IdVo>().ok(scenesService.add(dto));
+        }
     }
 
     @PutMapping
     @ApiOperation("修改")
     @LogOperation("修改")
-    @PreAuthorize("@ex.hasAuthority('basic:scenes:update')")
-    public Result<Long> update(@RequestBody ScenesDTO dto){
+//    @PreAuthorize("@ex.hasAuthority('basic:scenes:update')")
+    public Result<IdVo> update(@RequestBody ScenesDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
 
-        scenesService.update(dto);
-
-        return new Result<Long>().ok(dto.getId());
+        //验证编码是否重名
+        ScenesDTO entity = scenesService.get(dto.getId());
+        QueryWrapper<Scenes> wrapper1 = new QueryWrapper<>();
+        wrapper1.eq(Scenes.CODE, dto.getCode());
+        if(!entity.getCode().equals(dto.getCode()) && scenesMapper.selectCount(wrapper1)!= 0){
+            return new Result().error(1,"编码重复");
+        }
+        //验证名称是否重名
+        QueryWrapper<Scenes> wrapper2 = new QueryWrapper<>();
+        wrapper2.eq(Scenes.SCENES_NAME, dto.getScenesName());
+        System.out.println(scenesMapper.selectCount(wrapper2));
+        if(!entity.getScenesName().equals(dto.getScenesName()) && scenesMapper.selectCount(wrapper2)!= 0){
+            return new Result().error(1,"名称重复");
+        }
+        else {
+            return new Result<IdVo>().ok(scenesService.edit(dto));
+        }
     }
 
     @DeleteMapping
     @ApiOperation("删除")
     @LogOperation("删除")
-    @PreAuthorize("@ex.hasAuthority('basic:scenes:delete')")
+//    @PreAuthorize("@ex.hasAuthority('basic:scenes:delete')")
     public Result delete(@RequestBody Long[] ids){
         //效验数据
         AssertUtils.isArrayEmpty(ids, "id");
@@ -106,11 +140,17 @@ public class ScenesController {
     @GetMapping("export")
     @ApiOperation("导出")
     @LogOperation("导出")
-    @PreAuthorize("@ex.hasAuthority('basic:scenes:export')")
+//    @PreAuthorize("@ex.hasAuthority('basic:scenes:export')")
     public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
         List<ScenesDTO> list = scenesService.list(params);
 
         ExcelUtils.exportExcelToTarget(response, null, list, ScenesExcel.class);
     }
 
+    @PostMapping(value = "list")
+    @ApiOperation(value = "获取场景列表")
+    public List<ScenesDTO> list(){
+        return scenesService.list();
+    }
+
 }

ym-packing/src/main/java/com/cnbm/packing/controller/WoPackagingBoxController.java

@@ -65,7 +65,7 @@ public class WoPackagingBoxController {
     })
     public Result<PageData<WoPackagingBoxDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
         PageData<WoPackagingBoxDTO> page = woPackagingBoxService.page(params);
-        woPackagingBoxService.setColor(page.getList());
+//        woPackagingBoxService.setColor(page.getList());
         return new Result<PageData<WoPackagingBoxDTO>>().ok(page);
     }
 

ym-packing/src/main/java/com/cnbm/packing/controller/WoPackagingBoxSubstrateController.java

@@ -283,7 +283,7 @@ public class WoPackagingBoxSubstrateController {
         //验证该模组的线体、功率等级是否BoxID的线体、功率等级一致，一致，保存成功，数据发生更新。不一致，则显示保存失败，数据不发生更新
         WoPackagingBox box = woPackagingBoxMapper.selectList(boxQueryWrapper).get(0);
 
-        if((substrate.getLineBody()==box.getLineBody()) && (substrate.getPowerLevel().equals(box.getPowerLevel())) )
+        if((substrate.getLineBody().equals(box.getLineBody())) && (substrate.getPowerLevel().equals(box.getPowerLevel())) )
         {
             dto.setId(substrate.getId());
             woPackagingBoxSubstrateService.insertSubstrate(dto);
@@ -343,7 +343,7 @@ public class WoPackagingBoxSubstrateController {
     @ApiOperation("装箱单信息查询")
     public Result<PageData<WoPackagingBoxSubstrateDTO>> substrateList(@RequestBody PackingInfoQueryParam param){
         PageData<WoPackagingBoxSubstrateDTO> page = woPackagingBoxSubstrateService.substratePage(param);
-        woPackagingBoxSubstrateService.setColor(page.getList());
+//        woPackagingBoxSubstrateService.setColor(page.getList());
         return new Result<PageData<WoPackagingBoxSubstrateDTO>>().ok(page);
     }
 

ym-packing/src/main/java/com/cnbm/packing/controller/WorkingTimeController.java

@@ -1,5 +1,6 @@
 package com.cnbm.packing.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.cnbm.admin.annotation.LogOperation;
 import com.cnbm.common.constant.Constant;
 import com.cnbm.common.page.PageData;
@@ -10,14 +11,18 @@ import com.cnbm.common.validator.ValidatorUtils;
 import com.cnbm.common.validator.group.AddGroup;
 import com.cnbm.common.validator.group.DefaultGroup;
 import com.cnbm.common.validator.group.UpdateGroup;
+import com.cnbm.packing.dto.IdVo;
 import com.cnbm.packing.dto.WorkingTimeDTO;
+import com.cnbm.packing.entity.WorkingTime;
 import com.cnbm.packing.excel.WorkingTimeExcel;
+import com.cnbm.packing.mapper.WorkingTimeMapper;
 import com.cnbm.packing.service.WorkingTimeServiceBiz;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
@@ -40,6 +45,8 @@ import java.util.Map;
 public class WorkingTimeController {
     @Autowired
     private WorkingTimeServiceBiz workingTimeService;
+    @Autowired
+    private WorkingTimeMapper workingTimeMapper;
 
     @GetMapping("page")
     @ApiOperation("分页")
@@ -47,9 +54,9 @@ public class WorkingTimeController {
         @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataTypeClass=Integer.class) ,
         @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataTypeClass=Integer.class) ,
         @ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataTypeClass=String.class) ,
-        @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class)
+        @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class) ,
+        @ApiImplicitParam(name = "name", value = "班次名", paramType = "query", dataTypeClass = String.class)
     })
-    @PreAuthorize("@ex.hasAuthority('packing:workingTime:page')")
     public Result<PageData<WorkingTimeDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
         PageData<WorkingTimeDTO> page = workingTimeService.page(params);
 
@@ -58,7 +65,6 @@ public class WorkingTimeController {
 
     @GetMapping("{id}")
     @ApiOperation("信息")
-    @PreAuthorize("@ex.hasAuthority('packing:workingTime:info')")
     public Result<WorkingTimeDTO> get(@PathVariable("id") Long id){
         WorkingTimeDTO data = workingTimeService.get(id);
 
@@ -68,33 +74,55 @@ public class WorkingTimeController {
     @PostMapping
     @ApiOperation("保存")
     @LogOperation("保存")
-    @PreAuthorize("@ex.hasAuthority('packing:workingTime:save')")
-    public Result<Long> save(@RequestBody WorkingTimeDTO dto){
+    public Result<IdVo> save(@RequestBody WorkingTimeDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
 
-        workingTimeService.save(dto);
-
-        return new Result<Long>().ok(dto.getId());
+        //验证编码是否重名
+        QueryWrapper<WorkingTime> wrapper1 = new QueryWrapper<>();
+        wrapper1.eq(WorkingTime.CODE, dto.getCode());
+        if(workingTimeMapper.selectCount(wrapper1)!= 0){
+            return new Result().error(1,"编码重复");
+        }
+        //验证名称是否重名
+        QueryWrapper<WorkingTime> wrapper2 = new QueryWrapper<>();
+        wrapper2.eq(WorkingTime.ORDER_NAME, dto.getOrderName());
+        if(workingTimeMapper.selectCount(wrapper2)!= 0){
+            return new Result().error(1,"名称重复");
+        }
+        else {
+            return new Result<IdVo>().ok(workingTimeService.add(dto));
+        }
     }
 
     @PutMapping
     @ApiOperation("修改")
     @LogOperation("修改")
-    @PreAuthorize("@ex.hasAuthority('packing:workingTime:update')")
-    public Result<Long> update(@RequestBody WorkingTimeDTO dto){
+    public Result<IdVo> update(@RequestBody WorkingTimeDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
 
-        workingTimeService.update(dto);
-
-        return new Result<Long>().ok(dto.getId());
+        //验证编码是否重名
+        WorkingTimeDTO entity = workingTimeService.get(dto.getId());
+        QueryWrapper<WorkingTime> wrapper1 = new QueryWrapper<>();
+        wrapper1.eq(WorkingTime.CODE, dto.getCode());
+        if(!entity.getCode().equals(dto.getCode()) && workingTimeMapper.selectCount(wrapper1)!= 0){
+            return new Result().error(1,"编码重复");
+        }
+        //验证名称是否重名
+        QueryWrapper<WorkingTime> wrapper2 = new QueryWrapper<>();
+        wrapper2.eq( WorkingTime.ORDER_NAME, dto.getOrderName());
+        if(!entity.getOrderName().equals(dto.getOrderName()) && workingTimeMapper.selectCount(wrapper2)!= 0){
+            return new Result().error(1,"名称重复");
+        }
+        else {
+            return new Result<IdVo>().ok(workingTimeService.edit(dto));
+        }
     }
 
     @DeleteMapping
     @ApiOperation("删除")
     @LogOperation("删除")
-    @PreAuthorize("@ex.hasAuthority('packing:workingTime:delete')")
     public Result delete(@RequestBody Long[] ids){
         //效验数据
         AssertUtils.isArrayEmpty(ids, "id");
@@ -107,16 +135,22 @@ public class WorkingTimeController {
     @GetMapping("export")
     @ApiOperation("导出")
     @LogOperation("导出")
-    @PreAuthorize("@ex.hasAuthority('packing:workingTime:export')")
     public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
         List<WorkingTimeDTO> list = workingTimeService.list(params);
 
         ExcelUtils.exportExcelToTarget(response, null, list, WorkingTimeExcel.class);
     }
 
+    @PostMapping(value = "list")
+    @ApiOperation(value = "获取班次列表")
+    public List<WorkingTimeDTO> list(){
+        return workingTimeService.list();
+    }
+
     @GetMapping("getOrderName")
     @ApiOperation("查询时间匹配的班次名称")
-    public Result<String> getOrderName(@RequestBody LocalDateTime time){
+//    @ApiImplicitParam(name = "time", value = "时间", paramType = "query", required = true, dataTypeClass = LocalDateTime.class)
+    public Result<String> getOrderName(@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime time){
         String orderName = workingTimeService.getOrderName(time);
 
         return new Result<String>().ok(orderName);

ym-packing/src/main/java/com/cnbm/packing/dto/PrintModelDTO.java

@@ -14,7 +14,7 @@ import java.math.BigDecimal;
  * 打印标签模板表
  *
  * @author codeGenerator
- * @since  2023-02-20
+ * @since  2024-01-25
  */
 @Data
 @ApiModel(value = "打印标签模板表DTO对象")
@@ -62,7 +62,7 @@ public class PrintModelDTO implements Serializable {
 	@ApiModelProperty(value = "备注")
 	private String remark;
 
-	@ApiModelProperty(value = "类型，0：模组标签，1：等级标签")
+	@ApiModelProperty(value = "类型，1：手动，2：自动")
 	private Integer type;
 
 	@ApiModelProperty(value = "是否默认模板，0：否，1：是")
@@ -80,10 +80,19 @@ public class PrintModelDTO implements Serializable {
 	@ApiModelProperty(value = "是否启用，0 停用；1 启用")
 	private Integer isEnable;
 
-	@ApiModelProperty(value = "场景，前端传字符串过来，t_scenes 把value传过来放进去，不要放id")
+	@ApiModelProperty(value = "场景（用不着了，废弃）")
 	private String scenes;
 
-	@ApiModelProperty(value = "产品等级，t_product_level 把value传过来放进去，不要放id")
+	@ApiModelProperty(value = "产品等级，t_product_level 把code传过来放进去，不要放id")
 	private String productGrade;
 
+	@ApiModelProperty(value = "节数，前端写死，输入")
+	private String pitchNumber;
+
+	@ApiModelProperty(value = "产品等级，前端写死，输入")
+	private String maxFuseCurrent;
+
+	@ApiModelProperty(value = "产品等级，前端写死，输入")
+	private String coverName;
+
 }

ym-packing/src/main/java/com/cnbm/packing/dto/ProductLevelDTO.java

@@ -7,17 +7,19 @@ import lombok.Data;
 import java.io.Serializable;
 import java.time.LocalDateTime;
 
+import java.math.BigDecimal;
+
 
 /**
  * 产品等级 表
  *
  * @author codeGenerator
- * @since  2023-12-21
+ * @since  2023-12-28
  */
 @Data
 @ApiModel(value = "产品等级 表DTO对象")
 public class ProductLevelDTO implements Serializable {
-    private static final long serialVersionUID = 1L;
+	private static final long serialVersionUID = 1L;
 
 
 
@@ -28,7 +30,7 @@ public class ProductLevelDTO implements Serializable {
 	private String productName;
 
 	@ApiModelProperty(value = "产品等级，A1/A2/A3/A4/NK")
-	private LocalDateTime productLevel;
+	private String productLevel;
 
 	@ApiModelProperty(value = "备注")
 	private String remark;
@@ -57,4 +59,7 @@ public class ProductLevelDTO implements Serializable {
 	@ApiModelProperty(value = "版本号")
 	private Integer version;
 
+	@ApiModelProperty(value = "产品等级代码")
+	private String code;
+
 }

ym-packing/src/main/java/com/cnbm/packing/dto/ScenesDTO.java

@@ -7,17 +7,19 @@ import lombok.Data;
 import java.io.Serializable;
 import java.time.LocalDateTime;
 
+import java.math.BigDecimal;
+
 
 /**
  * 场景 表
  *
  * @author codeGenerator
- * @since  2023-12-21
+ * @since  2023-12-28
  */
 @Data
 @ApiModel(value = "场景 表DTO对象")
 public class ScenesDTO implements Serializable {
-    private static final long serialVersionUID = 1L;
+	private static final long serialVersionUID = 1L;
 
 
 
@@ -54,4 +56,7 @@ public class ScenesDTO implements Serializable {
 	@ApiModelProperty(value = "版本号")
 	private Integer version;
 
+	@ApiModelProperty(value = "场景code")
+	private String code;
+
 }

ym-packing/src/main/java/com/cnbm/packing/dto/WoPackagingBoxDTO.java

@@ -43,7 +43,7 @@ public class WoPackagingBoxDTO implements Serializable {
 	@ApiModelProperty(value = "等级（舍弃）")
 	private Integer grade;
 
-	@ApiModelProperty(value = "基板数量，每个包装箱最大20片（舍弃）")
+	@ApiModelProperty(value = "基板数量，每个包装箱最大20片")
 	private Integer substrateQuantity;
 
 	@ApiModelProperty(value = "装箱完成时间，指的是包装完成时间")
@@ -118,7 +118,16 @@ public class WoPackagingBoxDTO implements Serializable {
 	@ApiModelProperty(value = "基板列表")
 	private List<WoPackagingBoxSubstrate> substrateList;
 
-	@ApiModelProperty(value = "颜色（物料号匹配）")
-	private String color;
+	@ApiModelProperty(value = "产品等级，t_product_level 把code传过来放进去，不要放id")
+	private String productGrade;
+
+	@ApiModelProperty(value = "节数，前端写死，输入")
+	private String pitchNumber;
+
+	@ApiModelProperty(value = "最大额定熔断电流，前端写死，输入")
+	private String maxFuseCurrent;
+
+	@ApiModelProperty(value = "盖板，前端写死，输入")
+	private String coverName;
 
 }

ym-packing/src/main/java/com/cnbm/packing/dto/WoPackagingBoxSubstrateDTO.java

@@ -185,7 +185,16 @@ public class WoPackagingBoxSubstrateDTO implements Serializable {
 	@ApiModelProperty(value = "最近打印时间(转)")
 	private String printTime1;
 
-	@ApiModelProperty(value = "颜色（物料号匹配）")
-	private String color;
+	@ApiModelProperty(value = "产品等级，t_product_level 把code传过来放进去，不要放id")
+	private String productGrade;
+
+	@ApiModelProperty(value = "节数，前端写死，输入")
+	private String pitchNumber;
+
+	@ApiModelProperty(value = "最大额定熔断电流，前端写死，输入")
+	private String maxFuseCurrent;
+
+	@ApiModelProperty(value = "盖板，前端写死，输入")
+	private String coverName;
 
 }

ym-packing/src/main/java/com/cnbm/packing/dto/WorkingTimeDTO.java

@@ -7,17 +7,19 @@ import lombok.Data;
 import java.io.Serializable;
 import java.time.LocalDateTime;
 
+import java.math.BigDecimal;
+
 
 /**
  * 班次时间段 表
  *
  * @author codeGenerator
- * @since  2023-12-19
+ * @since  2023-12-28
  */
 @Data
 @ApiModel(value = "班次时间段 表DTO对象")
 public class WorkingTimeDTO implements Serializable {
-    private static final long serialVersionUID = 1L;
+	private static final long serialVersionUID = 1L;
 
 
 
@@ -60,4 +62,7 @@ public class WorkingTimeDTO implements Serializable {
 	@ApiModelProperty(value = "版本号")
 	private Integer version;
 
+	@ApiModelProperty(value = "班次代码")
+	private String code;
+
 }

ym-packing/src/main/java/com/cnbm/packing/entity/PrintModel.java

@@ -14,7 +14,7 @@ import lombok.Data;
  * </p>
  *
  * @author codeGenerator
- * @since 2023-02-20
+ * @since 2024-01-25
  */
 @Data
 @TableName("t_print_model")
@@ -63,7 +63,7 @@ public class PrintModel implements Serializable {
     @ApiModelProperty("备注")
     private String remark;
 
-    @ApiModelProperty("类型，0：模组标签，1：等级标签")
+    @ApiModelProperty("类型，1：手动，2：自动")
     private Integer type;
 
     @ApiModelProperty("是否默认模板，0：否，1：是")
@@ -81,12 +81,21 @@ public class PrintModel implements Serializable {
     @ApiModelProperty("是否启用，0 停用；1 启用")
     private Integer isEnable;
 
-    @ApiModelProperty("场景，前端传字符串过来，t_scenes 把value传过来放进去，不要放id")
+    @ApiModelProperty("场景（用不着了，废弃）")
     private String scenes;
 
-    @ApiModelProperty("产品等级，t_product_level 把value传过来放进去，不要放id")
+    @ApiModelProperty("产品等级，t_product_level 把code传过来放进去，不要放id")
     private String productGrade;
 
+    @ApiModelProperty("节数，前端写死，输入")
+    private String pitchNumber;
+
+    @ApiModelProperty("产品等级，前端写死，输入")
+    private String maxFuseCurrent;
+
+    @ApiModelProperty("产品等级，前端写死，输入")
+    private String coverName;
+
 
     public static final String ID = "ID";
 
@@ -130,4 +139,10 @@ public class PrintModel implements Serializable {
 
     public static final String PRODUCT_GRADE = "product_grade";
 
+    public static final String PITCH_NUMBER = "pitch_number";
+
+    public static final String MAX_FUSE_CURRENT = "max_fuse_current";
+
+    public static final String COVER_NAME = "cover_name";
+
 }

ym-packing/src/main/java/com/cnbm/packing/entity/ProductLevel.java

@@ -2,20 +2,19 @@ package com.cnbm.packing.entity;
 
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
 /**
  * <p>
  * 产品等级 表
  * </p>
  *
  * @author codeGenerator
- * @since 2023-12-21
+ * @since 2023-12-28
  */
 @Data
 @TableName("t_product_level")
@@ -31,7 +30,7 @@ public class ProductLevel implements Serializable {
     private String productName;
 
     @ApiModelProperty("产品等级，A1/A2/A3/A4/NK")
-    private LocalDateTime productLevel;
+    private String productLevel;
 
     @ApiModelProperty("备注")
     private String remark;
@@ -61,6 +60,9 @@ public class ProductLevel implements Serializable {
     @ApiModelProperty("版本号")
     private Integer version;
 
+    @ApiModelProperty("产品等级代码")
+    private String code;
+
 
     public static final String ID = "id";
 
@@ -86,4 +88,6 @@ public class ProductLevel implements Serializable {
 
     public static final String VERSION = "version";
 
+    public static final String CODE = "code";
+
 }

ym-packing/src/main/java/com/cnbm/packing/entity/Scenes.java

@@ -2,20 +2,19 @@ package com.cnbm.packing.entity;
 
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
 /**
  * <p>
  * 场景 表
  * </p>
  *
  * @author codeGenerator
- * @since 2023-12-21
+ * @since 2023-12-28
  */
 @Data
 @TableName("t_scenes")
@@ -58,6 +57,9 @@ public class Scenes implements Serializable {
     @ApiModelProperty("版本号")
     private Integer version;
 
+    @ApiModelProperty("场景code")
+    private String code;
+
 
     public static final String ID = "id";
 
@@ -81,4 +83,6 @@ public class Scenes implements Serializable {
 
     public static final String VERSION = "version";
 
+    public static final String CODE = "code";
+
 }

ym-packing/src/main/java/com/cnbm/packing/entity/WoPackagingBox.java

@@ -41,7 +41,7 @@ public class WoPackagingBox implements Serializable {
     @ApiModelProperty("等级（舍弃）")
     private Integer grade;
 
-    @ApiModelProperty("基板数量，每个包装箱最大20片（舍弃）")
+    @ApiModelProperty("基板数量，每个包装箱最大20片")
     private Integer substrateQuantity;
 
     @ApiModelProperty("装箱完成时间，指的是包装完成时间")
@@ -114,6 +114,18 @@ public class WoPackagingBox implements Serializable {
     @ApiModelProperty("订单号")
     private String orderNum;
 
+    @ApiModelProperty("产品等级，t_product_level 把code传过来放进去，不要放id")
+    private String productGrade;
+
+    @ApiModelProperty("节数，前端写死，输入")
+    private String pitchNumber;
+
+    @ApiModelProperty("最大额定熔断电流，前端写死，输入")
+    private String maxFuseCurrent;
+
+    @ApiModelProperty("盖板，前端写死，输入")
+    private String coverName;
+
 
     public static final String ID = "ID";
 
@@ -175,4 +187,12 @@ public class WoPackagingBox implements Serializable {
 
     public static final String ORDER_NUM = "ORDER_NUM";
 
+    public static final String PRODUCT_GRADE = "product_grade";
+
+    public static final String PITCH_NUMBER = "pitch_number";
+
+    public static final String MAX_FUSE_CURRENT = "max_fuse_current";
+
+    public static final String COVER_NAME = "cover_name";
+
 }

ym-packing/src/main/java/com/cnbm/packing/entity/WorkingTime.java

@@ -2,20 +2,19 @@ package com.cnbm.packing.entity;
 
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
 /**
  * <p>
  * 班次时间段 表
  * </p>
  *
  * @author codeGenerator
- * @since 2023-12-19
+ * @since 2023-12-28
  */
 @Data
 @TableName("t_working_time")
@@ -64,6 +63,9 @@ public class WorkingTime implements Serializable {
     @ApiModelProperty("版本号")
     private Integer version;
 
+    @ApiModelProperty("班次代码")
+    private String code;
+
 
     public static final String ID = "id";
 
@@ -91,4 +93,6 @@ public class WorkingTime implements Serializable {
 
     public static final String VERSION = "version";
 
+    public static final String CODE = "code";
+
 }

ym-packing/src/main/java/com/cnbm/packing/excel/PrintModelExcel.java

@@ -12,7 +12,7 @@ import java.util.Date;
  * 打印标签模板表
  *
  * @author codeGenerator
- * @since  2023-02-20
+ * @since  2024-01-25
  */
 @Data
 public class PrintModelExcel {
@@ -42,7 +42,7 @@ public class PrintModelExcel {
     private Integer valid;
     @Excel(name = "备注")
     private String remark;
-    @Excel(name = "类型，0：模组标签，1：等级标签")
+    @Excel(name = "类型，1：手动，2：自动")
     private Integer type;
     @Excel(name = "是否默认模板，0：否，1：是")
     private Integer isDefault;
@@ -54,9 +54,15 @@ public class PrintModelExcel {
     private Integer lineBody;
     @Excel(name = "是否启用，0 停用；1 启用")
     private Integer isEnable;
-    @Excel(name = "场景，前端传字符串过来，t_scenes 把value传过来放进去，不要放id")
+    @Excel(name = "场景（用不着了，废弃）")
     private String scenes;
-    @Excel(name = "产品等级，t_product_level 把value传过来放进去，不要放id")
+    @Excel(name = "产品等级，t_product_level 把code传过来放进去，不要放id")
     private String productGrade;
+    @Excel(name = "节数，前端写死，输入")
+    private String pitchNumber;
+    @Excel(name = "产品等级，前端写死，输入")
+    private String maxFuseCurrent;
+    @Excel(name = "产品等级，前端写死，输入")
+    private String coverName;
 
 }

ym-packing/src/main/java/com/cnbm/packing/excel/ProductLevelExcel.java

@@ -4,12 +4,15 @@ import cn.afterturn.easypoi.excel.annotation.Excel;
 import lombok.Data;
 
 import java.time.LocalDateTime;
+import java.math.BigDecimal;
+
+import java.util.Date;
 
 /**
  * 产品等级 表
  *
  * @author codeGenerator
- * @since  2023-12-21
+ * @since  2023-12-28
  */
 @Data
 public class ProductLevelExcel {
@@ -18,7 +21,7 @@ public class ProductLevelExcel {
     @Excel(name = "产品名")
     private String productName;
     @Excel(name = "产品等级，A1/A2/A3/A4/NK")
-    private LocalDateTime productLevel;
+    private String productLevel;
     @Excel(name = "备注")
     private String remark;
     @Excel(name = "删除标志，是否有效:1 可用 0不可用")
@@ -37,5 +40,7 @@ public class ProductLevelExcel {
     private LocalDateTime updateTime;
     @Excel(name = "版本号")
     private Integer version;
+    @Excel(name = "产品等级代码")
+    private String code;
 
 }

ym-packing/src/main/java/com/cnbm/packing/excel/ScenesExcel.java

@@ -4,12 +4,15 @@ import cn.afterturn.easypoi.excel.annotation.Excel;
 import lombok.Data;
 
 import java.time.LocalDateTime;
+import java.math.BigDecimal;
+
+import java.util.Date;
 
 /**
  * 场景 表
  *
  * @author codeGenerator
- * @since  2023-12-21
+ * @since  2023-12-28
  */
 @Data
 public class ScenesExcel {
@@ -35,5 +38,7 @@ public class ScenesExcel {
     private LocalDateTime updateTime;
     @Excel(name = "版本号")
     private Integer version;
+    @Excel(name = "场景code")
+    private String code;
 
 }

ym-packing/src/main/java/com/cnbm/packing/excel/WoPackagingBoxSubstrateExcel.java

@@ -38,6 +38,14 @@ public class WoPackagingBoxSubstrateExcel {
     private Float actualPmpp;
     @Excel(name = "线体")
     private Integer lineBody;
+    @Excel(name = "盖板")
+    private String coverName;
+    @Excel(name = "产品等级")
+    private String productGrade;
+    @Excel(name = "最大额定熔断电流")
+    private String maxFuseCurrent;
+    @Excel(name = "节数")
+    private String pitchNumber;
     @Excel(name = "最近打印时间")
     private String printTime1;
 

ym-packing/src/main/java/com/cnbm/packing/excel/WoPackagingBoxSubstrateManualExcel.java

@@ -26,6 +26,14 @@ public class WoPackagingBoxSubstrateManualExcel {
     private String powerLevel;
     @Excel(name = "线体")
     private Integer lineBody;
+    @Excel(name = "盖板")
+    private String coverName;
+    @Excel(name = "产品等级")
+    private String productGrade;
+    @Excel(name = "最大额定熔断电流")
+    private String maxFuseCurrent;
+    @Excel(name = "节数")
+    private String pitchNumber;
     @Excel(name = "最近打印时间")
     private String printTime1;
 

ym-packing/src/main/java/com/cnbm/packing/excel/WorkingTimeExcel.java

@@ -4,12 +4,15 @@ import cn.afterturn.easypoi.excel.annotation.Excel;
 import lombok.Data;
 
 import java.time.LocalDateTime;
+import java.math.BigDecimal;
+
+import java.util.Date;
 
 /**
  * 班次时间段 表
  *
  * @author codeGenerator
- * @since  2023-12-19
+ * @since  2023-12-28
  */
 @Data
 public class WorkingTimeExcel {
@@ -39,5 +42,7 @@ public class WorkingTimeExcel {
     private LocalDateTime updateTime;
     @Excel(name = "版本号")
     private Integer version;
+    @Excel(name = "班次代码")
+    private String code;
 
 }

ym-packing/src/main/java/com/cnbm/packing/service/ProductLevelServiceBiz.java

@@ -2,6 +2,7 @@ package com.cnbm.packing.service;
 
 import com.cnbm.common.page.PageData;
 import com.cnbm.common.service.CrudService;
+import com.cnbm.packing.dto.IdVo;
 import com.cnbm.packing.dto.ProductLevelDTO;
 import com.cnbm.packing.entity.ProductLevel;
 
@@ -27,5 +28,8 @@ public interface ProductLevelServiceBiz extends CrudService<ProductLevel, Produc
     void delete(Long[] ids);
 
     List<ProductLevelDTO> list();
-    
+
+    IdVo add(ProductLevelDTO dto);
+
+    IdVo edit(ProductLevelDTO dto);
 }

ym-packing/src/main/java/com/cnbm/packing/service/ScenesServiceBiz.java

@@ -2,6 +2,7 @@ package com.cnbm.packing.service;
 
 import com.cnbm.common.page.PageData;
 import com.cnbm.common.service.CrudService;
+import com.cnbm.packing.dto.IdVo;
 import com.cnbm.packing.dto.ScenesDTO;
 import com.cnbm.packing.entity.Scenes;
 
@@ -22,10 +23,14 @@ public interface ScenesServiceBiz extends CrudService<Scenes, ScenesDTO> {
 
     void save(ScenesDTO dto);
 
+    IdVo add(ScenesDTO dto);
+
     void update(ScenesDTO dto);
 
+    IdVo edit(ScenesDTO dto);
+
     void delete(Long[] ids);
 
     List<ScenesDTO> list();
-    
+
 }

ym-packing/src/main/java/com/cnbm/packing/service/WoPackagingBoxServiceBiz.java

@@ -57,5 +57,5 @@ public interface WoPackagingBoxServiceBiz extends CrudService<WoPackagingBox, Wo
 
     R<IPage<SubIdPageVo>> subIdPage(SubIdQueryParam param);
 
-    void setColor(List<WoPackagingBoxDTO> list);
+//    void setColor(List<WoPackagingBoxDTO> list);
 }

ym-packing/src/main/java/com/cnbm/packing/service/WoPackagingBoxSubstrateServiceBiz.java

@@ -47,5 +47,5 @@ public interface WoPackagingBoxSubstrateServiceBiz extends CrudService<WoPackagi
 
     int updatePackagingBoxIdAndSlotByWoSubstrateId(String packagingBoxId,Integer slot,String woSubstrateId);
 
-    void setColor(List<WoPackagingBoxSubstrateDTO> list);
+//    void setColor(List<WoPackagingBoxSubstrateDTO> list);
 }

ym-packing/src/main/java/com/cnbm/packing/service/WorkingTimeServiceBiz.java

@@ -2,6 +2,7 @@ package com.cnbm.packing.service;
 
 import com.cnbm.common.page.PageData;
 import com.cnbm.common.service.CrudService;
+import com.cnbm.packing.dto.IdVo;
 import com.cnbm.packing.dto.WorkingTimeDTO;
 import com.cnbm.packing.dto.WorkingTimeDTO;
 import com.cnbm.packing.entity.WorkingTime;
@@ -31,4 +32,8 @@ public interface WorkingTimeServiceBiz extends CrudService<WorkingTime, WorkingT
     List<WorkingTimeDTO> list();
 
     String getOrderName(LocalDateTime time);
+
+    IdVo add(WorkingTimeDTO dto);
+
+    IdVo edit(WorkingTimeDTO dto);
 }

ym-packing/src/main/java/com/cnbm/packing/service/impl/ProductLevelServiceBizImpl.java

@@ -6,6 +6,7 @@ import com.cnbm.admin.utils.BaseSupportUtils;
 import com.cnbm.common.page.PageData;
 import com.cnbm.common.service.impl.CrudServiceImpl;
 import com.cnbm.common.utils.ConvertUtils;
+import com.cnbm.packing.dto.IdVo;
 import com.cnbm.packing.dto.ProductLevelDTO;
 import com.cnbm.packing.entity.ProductLevel;
 import com.cnbm.packing.mapper.ProductLevelMapper;
@@ -33,10 +34,10 @@ public class ProductLevelServiceBizImpl extends CrudServiceImpl<ProductLevelMapp
     
     @Override
     public QueryWrapper<ProductLevel> getWrapper(Map<String, Object> params){
-        String id = (String)params.get("id");
+        String name = (String) params.get("name");
 
         QueryWrapper<ProductLevel> wrapper = new QueryWrapper<>();
-        wrapper.eq(StringUtils.isNotBlank(id), "id", id);
+        wrapper.like(StringUtils.isNotBlank(name), ProductLevel.PRODUCT_LEVEL, name);
 
         return wrapper;
     }
@@ -64,6 +65,16 @@ public class ProductLevelServiceBizImpl extends CrudServiceImpl<ProductLevelMapp
         insert(entity);
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public IdVo add(ProductLevelDTO dto) {
+        ProductLevel entity = ConvertUtils.sourceToTarget(dto, ProductLevel.class);
+        BaseSupportUtils.setCommonField(entity);
+        insert(entity);
+        return IdVo.builder().id(entity.getId()).build();
+    }
+
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void update(ProductLevelDTO dto) {
@@ -72,6 +83,15 @@ public class ProductLevelServiceBizImpl extends CrudServiceImpl<ProductLevelMapp
         updateById(entity);
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public IdVo edit(ProductLevelDTO dto) {
+        ProductLevel entity = ConvertUtils.sourceToTarget(dto, ProductLevel.class);
+        BaseSupportUtils.setUpdateCommonField(entity);
+        updateById(entity);
+        return IdVo.builder().id(entity.getId()).build();
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void delete(Long[] ids) {

ym-packing/src/main/java/com/cnbm/packing/service/impl/ScenesServiceBizImpl.java

@@ -6,6 +6,7 @@ import com.cnbm.admin.utils.BaseSupportUtils;
 import com.cnbm.common.page.PageData;
 import com.cnbm.common.service.impl.CrudServiceImpl;
 import com.cnbm.common.utils.ConvertUtils;
+import com.cnbm.packing.dto.IdVo;
 import com.cnbm.packing.dto.ScenesDTO;
 import com.cnbm.packing.entity.Scenes;
 import com.cnbm.packing.mapper.ScenesMapper;
@@ -33,10 +34,10 @@ public class ScenesServiceBizImpl extends CrudServiceImpl<ScenesMapper, Scenes,
     
     @Override
     public QueryWrapper<Scenes> getWrapper(Map<String, Object> params){
-        String id = (String)params.get("id");
+        String name = (String) params.get("name");
 
         QueryWrapper<Scenes> wrapper = new QueryWrapper<>();
-        wrapper.eq(StringUtils.isNotBlank(id), "id", id);
+        wrapper.like(StringUtils.isNotBlank(name), Scenes.SCENES_NAME, name);
 
         return wrapper;
     }
@@ -86,5 +87,22 @@ public class ScenesServiceBizImpl extends CrudServiceImpl<ScenesMapper, Scenes,
         return list;
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public IdVo add(ScenesDTO dto) {
+        Scenes entity = ConvertUtils.sourceToTarget(dto, Scenes.class);
+        BaseSupportUtils.setCommonField(entity);
+        insert(entity);
+        return IdVo.builder().id(entity.getId()).build();
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public IdVo edit(ScenesDTO dto) {
+        Scenes entity = ConvertUtils.sourceToTarget(dto, Scenes.class);
+        BaseSupportUtils.setUpdateCommonField(entity);
+        updateById(entity);
+        return IdVo.builder().id(entity.getId()).build();
+    }
 
 }

ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingBoxServiceBizImpl.java

@@ -28,10 +28,8 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 包装箱表
@@ -140,12 +138,25 @@ public class WoPackagingBoxServiceBizImpl extends CrudServiceImpl<WoPackagingBox
     public WoPackagingBoxDTO printList(Long id) {
         WoPackagingBox entity = baseDao.selectById(id);
         WoPackagingBoxDTO dto = ConvertUtils.sourceToTarget(entity, WoPackagingBoxDTO.class);
-        matchColor(dto);
+//        matchColor(dto);
         QueryWrapper<WoPackagingBoxSubstrate> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(entity.getBoxNo()), WoPackagingBoxSubstrate.PACKAGING_BOX_ID, entity.getBoxNo());
-        wrapper.orderByAsc(WoPackagingBoxSubstrate.SLOT);
+        //重复上片基板去重
+//        wrapper.orderByAsc(WoPackagingBoxSubstrate.SLOT);
         List<WoPackagingBoxSubstrate> woPackagingBoxSubstrateList = substrateMapper.selectList(wrapper);
-        dto.setSubstrateList(woPackagingBoxSubstrateList);
+        List<WoPackagingBoxSubstrate> distinctList = new ArrayList<>();
+        Map<String, List<WoPackagingBoxSubstrate>> map = woPackagingBoxSubstrateList.stream().sorted(Comparator.comparing(WoPackagingBoxSubstrate::getCreateTime).reversed())
+                .collect(Collectors.groupingBy(WoPackagingBoxSubstrate::getWoSubstrateId));
+        for (Map.Entry<String, List<WoPackagingBoxSubstrate>> entry : map.entrySet()) {
+            //取list首并放入到新list中
+            distinctList.add(entry.getValue().get(0));
+        }
+//        List<WoPackagingBoxSubstrate> distinctList = woPackagingBoxSubstrateList.stream().collect(
+//                Collectors.collectingAndThen(
+//                        Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(WoPackagingBoxSubstrate::getWoSubstrateId))), ArrayList::new)
+//        );
+        List<WoPackagingBoxSubstrate> sortedDistinctList = distinctList.stream().sorted(Comparator.comparing(WoPackagingBoxSubstrate::getSlot)).collect(Collectors.toList());
+        dto.setSubstrateList(sortedDistinctList);
         return dto;
     }
 
@@ -251,6 +262,7 @@ public class WoPackagingBoxServiceBizImpl extends CrudServiceImpl<WoPackagingBox
         return R.ok(iPage);
     }
 
+    /*
     @Override
     public void setColor(List<WoPackagingBoxDTO> list) {
         list.forEach(e -> {
@@ -404,5 +416,6 @@ public class WoPackagingBoxServiceBizImpl extends CrudServiceImpl<WoPackagingBox
             }
         }
     }
+    */
     
 }

ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingBoxSubstrateServiceBizImpl.java

@@ -232,6 +232,7 @@ public class WoPackagingBoxSubstrateServiceBizImpl extends CrudServiceImpl<WoPac
         return mapper.updatePackagingBoxIdAndSlotByWoSubstrateId(packagingBoxId,slot,woSubstrateId);
     }
 
+    /*
     @Override
     public void setColor(List<WoPackagingBoxSubstrateDTO> list) {
         list.forEach(e -> {
@@ -381,4 +382,5 @@ public class WoPackagingBoxSubstrateServiceBizImpl extends CrudServiceImpl<WoPac
             }
         });
     }
+     */
 }

ym-packing/src/main/java/com/cnbm/packing/service/impl/WorkingTimeServiceBizImpl.java

@@ -3,15 +3,16 @@ package com.cnbm.packing.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.cnbm.admin.utils.BaseSupportUtils;
+import com.cnbm.common.exception.RenException;
 import com.cnbm.common.page.PageData;
 import com.cnbm.common.service.impl.CrudServiceImpl;
 
 import com.cnbm.common.utils.ConvertUtils;
+import com.cnbm.packing.dto.IdVo;
 import com.cnbm.packing.dto.WorkingTimeDTO;
 import com.cnbm.packing.entity.WorkingTime;
 import com.cnbm.packing.mapper.WorkingTimeMapper;
 import com.cnbm.packing.service.WorkingTimeServiceBiz;
-import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -39,10 +40,10 @@ public class WorkingTimeServiceBizImpl extends CrudServiceImpl<WorkingTimeMapper
 
     @Override
     public QueryWrapper<WorkingTime> getWrapper(Map<String, Object> params){
-        String id = (String)params.get("id");
+        String name = (String) params.get("name");
 
         QueryWrapper<WorkingTime> wrapper = new QueryWrapper<>();
-        wrapper.eq(StringUtils.isNotBlank(id), "id", id);
+        wrapper.like(StringUtils.isNotBlank(name), WorkingTime.ORDER_NAME, name);
 
         return wrapper;
     }
@@ -65,11 +66,59 @@ public class WorkingTimeServiceBizImpl extends CrudServiceImpl<WorkingTimeMapper
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void save(WorkingTimeDTO dto) {
+        //验证时间段不重合
+        timeOverlap(dto);
         WorkingTime entity = ConvertUtils.sourceToTarget(dto, WorkingTime.class);
         BaseSupportUtils.setCommonField(entity);
         insert(entity);
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public IdVo add(WorkingTimeDTO dto) {
+        //验证时间段不重合
+        timeOverlap(dto);
+        WorkingTime entity = ConvertUtils.sourceToTarget(dto, WorkingTime.class);
+        BaseSupportUtils.setCommonField(entity);
+        insert(entity);
+        return IdVo.builder().id(entity.getId()).build();
+    }
+
+    public void timeOverlap(WorkingTimeDTO newTime){
+        List<WorkingTimeDTO> dtoList = list();
+        LocalTime newBeginTime = newTime.getBeginTime().toLocalTime();
+        LocalTime newEndTime = newTime.getEndTime().toLocalTime();
+        //不跨天
+        if(newBeginTime.isBefore(newEndTime)) {
+            for(WorkingTimeDTO oldTime: dtoList) {
+                LocalTime beginTime = oldTime.getBeginTime().toLocalTime();
+                LocalTime endTime = oldTime.getEndTime().toLocalTime();
+                //不重叠算法：A.end< B.start || A.start > B.end
+                if(! (newEndTime.isBefore(beginTime)|| newBeginTime.isAfter(endTime))){
+                    throw new RenException("班次时间重合");
+                }
+            }
+        }
+        //跨天
+        else{
+            //是否存在跨天班次
+            long count = dtoList.stream().filter(e->e.getBeginTime().toLocalTime().isAfter(e.getEndTime().toLocalTime())).count();
+            if(count>0){
+                throw new RenException("班次时间重合");
+            }
+            else{
+                for(WorkingTimeDTO oldTime: dtoList) {
+                    LocalTime beginTime = oldTime.getBeginTime().toLocalTime();
+                    LocalTime endTime = oldTime.getEndTime().toLocalTime();
+                    //不重叠算法：A.end< B.start || A.start > B.end
+                    if(! (newEndTime.isBefore(beginTime)|| newBeginTime.isAfter(endTime))){
+                        throw new RenException("班次时间重合");
+                    }
+                }
+            }
+        }
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void update(WorkingTimeDTO dto) {
@@ -78,6 +127,18 @@ public class WorkingTimeServiceBizImpl extends CrudServiceImpl<WorkingTimeMapper
         updateById(entity);
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public IdVo edit(WorkingTimeDTO dto) {
+        //验证时间段不重合
+        timeOverlap(dto);
+        WorkingTime entity = ConvertUtils.sourceToTarget(dto, WorkingTime.class);
+        BaseSupportUtils.setUpdateCommonField(entity);
+        updateById(entity);
+        return IdVo.builder().id(entity.getId()).build();
+    }
+
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void delete(Long[] ids) {
@@ -94,7 +155,6 @@ public class WorkingTimeServiceBizImpl extends CrudServiceImpl<WorkingTimeMapper
 
     @Override
     public String getOrderName(LocalDateTime time) {
-
         LocalTime localTime = time.toLocalTime();
         List<WorkingTimeDTO> resultList = new ArrayList<>();
         List<WorkingTimeDTO> listAll = mapper.list();
@@ -118,5 +178,4 @@ public class WorkingTimeServiceBizImpl extends CrudServiceImpl<WorkingTimeMapper
     }
 
 
-
 }

ym-packing/src/main/resources/mapper/ChangePackagingBoxHistoryMapper.xml

@@ -25,6 +25,7 @@
     <select id="list" resultType="com.cnbm.packing.dto.ChangePackagingBoxHistoryDTO">
         select * from t_change_packaging_box_history
         <where>
+            valid = 1
             <if test="startTime != null and endTime != null">
                 and create_time BETWEEN #{startTime} AND #{endTime}
             </if>

ym-packing/src/main/resources/mapper/PrintModleMapper.xml

@@ -24,10 +24,14 @@
         <id column="is_enable" property="isEnable" />
         <id column="scenes" property="scenes" />
         <id column="product_grade" property="productGrade" />
+        <id column="pitch_number" property="pitchNumber" />
+        <id column="max_fuse_current" property="maxFuseCurrent" />
+        <id column="cover_name" property="coverName" />
     </resultMap>
 
     <select id="list" resultType="com.cnbm.packing.dto.PrintModelDTO">
         select * from t_print_model
+        where valid = 1
         order by id asc
     </select>
 

ym-packing/src/main/resources/mapper/ProductLevelMapper.xml

@@ -18,6 +18,7 @@
 
     <select id="list" resultType="com.cnbm.packing.dto.ProductLevelDTO">
         select * from t_product_level
+        where valid = 1
         order by id asc
     </select>
 

ym-packing/src/main/resources/mapper/ScenesMapper.xml

@@ -17,6 +17,7 @@
 
     <select id="list" resultType="com.cnbm.packing.dto.ScenesDTO">
         select * from t_scenes
+        where valid = 1
         order by id asc
     </select>
 

ym-packing/src/main/resources/mapper/WoCompensationPowerMapper.xml

@@ -27,6 +27,7 @@
 
     <select id="list" resultType="com.cnbm.packing.dto.WoCompensationPowerDTO">
         select * from t_wo_compensation_power
+        where valid = 1
         order by id asc
     </select>
 

ym-packing/src/main/resources/mapper/WoPackagingBoxMapper.xml

@@ -36,6 +36,7 @@
 
     <select id="list" resultType="com.cnbm.packing.dto.WoPackagingBoxDTO">
         select * from t_wo_packaging_box
+        where valid = 1
         order by id asc
     </select>
     <update id="updateIsArrivedByBoxNo">

ym-packing/src/main/resources/mapper/WoPackagingBoxSubstrateMapper.xml

@@ -124,7 +124,8 @@
 
     <select id="substrateList" resultType="com.cnbm.packing.dto.WoPackagingBoxSubstrateDTO">
         select
-        twpb.CREATE_TIME as boxCreateTime,twpbs.*,twpb.PRINT_TIME as printTime
+        twpb.CREATE_TIME as boxCreateTime,twpbs.*,twpb.PRINT_TIME as printTime,
+        twpb.product_grade as productGrade, twpb.pitch_number as pitchNumber, twpb.max_fuse_current as maxFuseCurrent, twpb.cover_name as coverName
         from t_wo_packaging_box_substrate twpbs
         left join t_wo_packaging_box twpb on twpbs.PACKAGING_BOX_ID = twpb.BOX_NO
         <where>
@@ -145,7 +146,8 @@
 
     <select id="substratePage" resultType="com.cnbm.packing.dto.WoPackagingBoxSubstrateDTO">
         select
-        twpb.CREATE_TIME as boxCreateTime,twpbs.*,twpb.PRINT_TIME as printTime
+        twpb.CREATE_TIME as boxCreateTime,twpbs.*,twpb.PRINT_TIME as printTime,
+        twpb.product_grade as productGrade, twpb.pitch_number as pitchNumber, twpb.max_fuse_current as maxFuseCurrent, twpb.cover_name as coverName
         from t_wo_packaging_box_substrate twpbs
         left join t_wo_packaging_box twpb on twpbs.PACKAGING_BOX_ID = twpb.BOX_NO
         <where>

ym-packing/src/main/resources/mapper/WoPackagingPrintHistoryMapper.xml

@@ -24,6 +24,7 @@
 
     <select id="list" resultType="com.cnbm.packing.dto.WoPackagingPrintHistoryDTO">
         select * from t_wo_packaging_print_history
+        where valid = 1
         order by id asc
     </select>
 

ym-packing/src/main/resources/mapper/WoPowerLevelMapper.xml

@@ -25,6 +25,7 @@
 
     <select id="list" resultType="com.cnbm.packing.dto.WoPowerLevelDTO">
         select * from t_wo_power_level
+        where valid = 1
         order by id asc
     </select>
 

ym-packing/src/main/resources/mapper/WorkingTimeMapper.xml

@@ -19,6 +19,7 @@
 
     <select id="list" resultType="com.cnbm.packing.dto.WorkingTimeDTO">
         select * from t_working_time
+        where valid = 1
         order by id asc
     </select>