From c8aad62eb4f1df87af9008b81aed35cb53da7343 Mon Sep 17 00:00:00 2001 From: yanyang Date: Tue, 30 Jan 2024 09:42:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../code/controller/PrintModelController.java | 2 +- .../controller/WoPackagingBoxController.java | 2 +- .../generator/code/dto/PrintModelDTO.java | 15 +++++++++--- .../generator/code/dto/WoPackagingBoxDTO.java | 16 +++++++++++-- .../generator/code/entity/PrintModel.java | 21 +++++++++++++--- .../generator/code/entity/WoPackagingBox.java | 24 +++++++++++++++++-- .../generator/code/excel/PrintModelExcel.java | 12 +++++++--- .../code/excel/WoPackagingBoxExcel.java | 12 ++++++++-- .../code/mapper/PrintModelMapper.java | 2 +- .../code/mapper/PrintModelMapper.xml | 3 +++ .../code/mapper/WoPackagingBoxMapper.java | 2 +- .../code/mapper/WoPackagingBoxMapper.xml | 4 ++++ .../generator/code/mysql/PrintModelmysql.sql | 12 +++++----- .../code/mysql/WoPackagingBoxmysql.sql | 12 +++++----- .../code/service/PrintModelServiceBiz.java | 2 +- .../service/WoPackagingBoxServiceBiz.java | 2 +- .../impl/PrintModelServiceBizImpl.java | 2 +- .../impl/WoPackagingBoxServiceBizImpl.java | 2 +- .../controller/WoPackagingBoxController.java | 2 +- .../WoPackagingBoxSubstrateController.java | 4 ++-- .../com/cnbm/packing/dto/PrintModelDTO.java | 17 +++++++++---- .../cnbm/packing/dto/WoPackagingBoxDTO.java | 15 +++++++++--- .../dto/WoPackagingBoxSubstrateDTO.java | 13 ++++++++-- .../com/cnbm/packing/entity/PrintModel.java | 23 ++++++++++++++---- .../cnbm/packing/entity/WoPackagingBox.java | 22 ++++++++++++++++- .../cnbm/packing/excel/PrintModelExcel.java | 14 +++++++---- .../service/WoPackagingBoxServiceBiz.java | 2 +- .../WoPackagingBoxSubstrateServiceBiz.java | 2 +- .../impl/WoPackagingBoxServiceBizImpl.java | 4 +++- ...WoPackagingBoxSubstrateServiceBizImpl.java | 2 ++ .../ChangePackagingBoxHistoryMapper.xml | 1 + .../resources/mapper/PrintModleMapper.xml | 4 ++++ .../mapper/WoCompensationPowerMapper.xml | 1 + .../resources/mapper/WoPackagingBoxMapper.xml | 1 + .../mapper/WoPackagingBoxSubstrateMapper.xml | 3 ++- .../mapper/WoPackagingPrintHistoryMapper.xml | 1 + .../resources/mapper/WoPowerLevelMapper.xml | 1 + 37 files changed, 219 insertions(+), 60 deletions(-) diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/controller/PrintModelController.java b/ym-generator/src/main/java/com/cnbm/generator/code/controller/PrintModelController.java index 1b65c65..fd55cbb 100644 --- a/ym-generator/src/main/java/com/cnbm/generator/code/controller/PrintModelController.java +++ b/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") diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/controller/WoPackagingBoxController.java b/ym-generator/src/main/java/com/cnbm/generator/code/controller/WoPackagingBoxController.java index e867640..00fc542 100644 --- a/ym-generator/src/main/java/com/cnbm/generator/code/controller/WoPackagingBoxController.java +++ b/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") diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/dto/PrintModelDTO.java b/ym-generator/src/main/java/com/cnbm/generator/code/dto/PrintModelDTO.java index a6f71af..fd3f3fc 100644 --- a/ym-generator/src/main/java/com/cnbm/generator/code/dto/PrintModelDTO.java +++ b/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; + } \ No newline at end of file diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/dto/WoPackagingBoxDTO.java b/ym-generator/src/main/java/com/cnbm/generator/code/dto/WoPackagingBoxDTO.java index 9e632c6..53e0ccd 100644 --- a/ym-generator/src/main/java/com/cnbm/generator/code/dto/WoPackagingBoxDTO.java +++ b/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; + } \ No newline at end of file diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/entity/PrintModel.java b/ym-generator/src/main/java/com/cnbm/generator/code/entity/PrintModel.java index 561e376..2c617b0 100644 --- a/ym-generator/src/main/java/com/cnbm/generator/code/entity/PrintModel.java +++ b/ym-generator/src/main/java/com/cnbm/generator/code/entity/PrintModel.java @@ -14,7 +14,7 @@ import lombok.Data; *

* * @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"; + } diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/entity/WoPackagingBox.java b/ym-generator/src/main/java/com/cnbm/generator/code/entity/WoPackagingBox.java index 1a9b6ab..f8b6fcb 100644 --- a/ym-generator/src/main/java/com/cnbm/generator/code/entity/WoPackagingBox.java +++ b/ym-generator/src/main/java/com/cnbm/generator/code/entity/WoPackagingBox.java @@ -14,7 +14,7 @@ import lombok.Data; *

* * @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"; + } diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/excel/PrintModelExcel.java b/ym-generator/src/main/java/com/cnbm/generator/code/excel/PrintModelExcel.java index 5ca05af..5c37acb 100644 --- a/ym-generator/src/main/java/com/cnbm/generator/code/excel/PrintModelExcel.java +++ b/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; } \ No newline at end of file diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/excel/WoPackagingBoxExcel.java b/ym-generator/src/main/java/com/cnbm/generator/code/excel/WoPackagingBoxExcel.java index fbaf77b..b909f9e 100644 --- a/ym-generator/src/main/java/com/cnbm/generator/code/excel/WoPackagingBoxExcel.java +++ b/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; } \ No newline at end of file diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/mapper/PrintModelMapper.java b/ym-generator/src/main/java/com/cnbm/generator/code/mapper/PrintModelMapper.java index cb86675..c1633bd 100644 --- a/ym-generator/src/main/java/com/cnbm/generator/code/mapper/PrintModelMapper.java +++ b/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 { diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/mapper/PrintModelMapper.xml b/ym-generator/src/main/java/com/cnbm/generator/code/mapper/PrintModelMapper.xml index f2456bb..abb105b 100644 --- a/ym-generator/src/main/java/com/cnbm/generator/code/mapper/PrintModelMapper.xml +++ b/ym-generator/src/main/java/com/cnbm/generator/code/mapper/PrintModelMapper.xml @@ -23,6 +23,9 @@ + + + diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/mapper/WoPackagingBoxMapper.java b/ym-generator/src/main/java/com/cnbm/generator/code/mapper/WoPackagingBoxMapper.java index e1a64d2..c6d4c54 100644 --- a/ym-generator/src/main/java/com/cnbm/generator/code/mapper/WoPackagingBoxMapper.java +++ b/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 { diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/mapper/WoPackagingBoxMapper.xml b/ym-generator/src/main/java/com/cnbm/generator/code/mapper/WoPackagingBoxMapper.xml index d72ca97..90845be 100644 --- a/ym-generator/src/main/java/com/cnbm/generator/code/mapper/WoPackagingBoxMapper.xml +++ b/ym-generator/src/main/java/com/cnbm/generator/code/mapper/WoPackagingBoxMapper.xml @@ -32,6 +32,10 @@ + + + + diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/mysql/PrintModelmysql.sql b/ym-generator/src/main/java/com/cnbm/generator/code/mysql/PrintModelmysql.sql index 24d4bce..8d7b7dc 100644 --- a/ym-generator/src/main/java/com/cnbm/generator/code/mysql/PrintModelmysql.sql +++ b/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()); diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/mysql/WoPackagingBoxmysql.sql b/ym-generator/src/main/java/com/cnbm/generator/code/mysql/WoPackagingBoxmysql.sql index 621ad8a..88d5202 100644 --- a/ym-generator/src/main/java/com/cnbm/generator/code/mysql/WoPackagingBoxmysql.sql +++ b/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()); diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/service/PrintModelServiceBiz.java b/ym-generator/src/main/java/com/cnbm/generator/code/service/PrintModelServiceBiz.java index 937c43c..571ac23 100644 --- a/ym-generator/src/main/java/com/cnbm/generator/code/service/PrintModelServiceBiz.java +++ b/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 { diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/service/WoPackagingBoxServiceBiz.java b/ym-generator/src/main/java/com/cnbm/generator/code/service/WoPackagingBoxServiceBiz.java index 201012c..ccf5271 100644 --- a/ym-generator/src/main/java/com/cnbm/generator/code/service/WoPackagingBoxServiceBiz.java +++ b/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 { diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/service/impl/PrintModelServiceBizImpl.java b/ym-generator/src/main/java/com/cnbm/generator/code/service/impl/PrintModelServiceBizImpl.java index 329b9c2..97267cc 100644 --- a/ym-generator/src/main/java/com/cnbm/generator/code/service/impl/PrintModelServiceBizImpl.java +++ b/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 implements PrintModelServiceBiz { diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/service/impl/WoPackagingBoxServiceBizImpl.java b/ym-generator/src/main/java/com/cnbm/generator/code/service/impl/WoPackagingBoxServiceBizImpl.java index 7046fe8..d8e799c 100644 --- a/ym-generator/src/main/java/com/cnbm/generator/code/service/impl/WoPackagingBoxServiceBizImpl.java +++ b/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 implements WoPackagingBoxServiceBiz { diff --git a/ym-packing/src/main/java/com/cnbm/packing/controller/WoPackagingBoxController.java b/ym-packing/src/main/java/com/cnbm/packing/controller/WoPackagingBoxController.java index f5eb3da..03a18b3 100644 --- a/ym-packing/src/main/java/com/cnbm/packing/controller/WoPackagingBoxController.java +++ b/ym-packing/src/main/java/com/cnbm/packing/controller/WoPackagingBoxController.java @@ -65,7 +65,7 @@ public class WoPackagingBoxController { }) public Result> page(@ApiIgnore @RequestParam Map params){ PageData page = woPackagingBoxService.page(params); - woPackagingBoxService.setColor(page.getList()); +// woPackagingBoxService.setColor(page.getList()); return new Result>().ok(page); } diff --git a/ym-packing/src/main/java/com/cnbm/packing/controller/WoPackagingBoxSubstrateController.java b/ym-packing/src/main/java/com/cnbm/packing/controller/WoPackagingBoxSubstrateController.java index b251005..71e173d 100644 --- a/ym-packing/src/main/java/com/cnbm/packing/controller/WoPackagingBoxSubstrateController.java +++ b/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> substrateList(@RequestBody PackingInfoQueryParam param){ PageData page = woPackagingBoxSubstrateService.substratePage(param); - woPackagingBoxSubstrateService.setColor(page.getList()); +// woPackagingBoxSubstrateService.setColor(page.getList()); return new Result>().ok(page); } diff --git a/ym-packing/src/main/java/com/cnbm/packing/dto/PrintModelDTO.java b/ym-packing/src/main/java/com/cnbm/packing/dto/PrintModelDTO.java index 6486a54..268adea 100644 --- a/ym-packing/src/main/java/com/cnbm/packing/dto/PrintModelDTO.java +++ b/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; + } \ No newline at end of file diff --git a/ym-packing/src/main/java/com/cnbm/packing/dto/WoPackagingBoxDTO.java b/ym-packing/src/main/java/com/cnbm/packing/dto/WoPackagingBoxDTO.java index 84eb4c9..82aca00 100644 --- a/ym-packing/src/main/java/com/cnbm/packing/dto/WoPackagingBoxDTO.java +++ b/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 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; } \ No newline at end of file diff --git a/ym-packing/src/main/java/com/cnbm/packing/dto/WoPackagingBoxSubstrateDTO.java b/ym-packing/src/main/java/com/cnbm/packing/dto/WoPackagingBoxSubstrateDTO.java index dd5c3f0..0754736 100644 --- a/ym-packing/src/main/java/com/cnbm/packing/dto/WoPackagingBoxSubstrateDTO.java +++ b/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; } \ No newline at end of file diff --git a/ym-packing/src/main/java/com/cnbm/packing/entity/PrintModel.java b/ym-packing/src/main/java/com/cnbm/packing/entity/PrintModel.java index 56cc9ab..3c1937d 100644 --- a/ym-packing/src/main/java/com/cnbm/packing/entity/PrintModel.java +++ b/ym-packing/src/main/java/com/cnbm/packing/entity/PrintModel.java @@ -14,7 +14,7 @@ import lombok.Data; *

* * @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"; + } diff --git a/ym-packing/src/main/java/com/cnbm/packing/entity/WoPackagingBox.java b/ym-packing/src/main/java/com/cnbm/packing/entity/WoPackagingBox.java index 7060363..fb7b75a 100644 --- a/ym-packing/src/main/java/com/cnbm/packing/entity/WoPackagingBox.java +++ b/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"; + } diff --git a/ym-packing/src/main/java/com/cnbm/packing/excel/PrintModelExcel.java b/ym-packing/src/main/java/com/cnbm/packing/excel/PrintModelExcel.java index 4c770b2..f3e4558 100644 --- a/ym-packing/src/main/java/com/cnbm/packing/excel/PrintModelExcel.java +++ b/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; } \ No newline at end of file diff --git a/ym-packing/src/main/java/com/cnbm/packing/service/WoPackagingBoxServiceBiz.java b/ym-packing/src/main/java/com/cnbm/packing/service/WoPackagingBoxServiceBiz.java index 526d4b5..0d4964f 100644 --- a/ym-packing/src/main/java/com/cnbm/packing/service/WoPackagingBoxServiceBiz.java +++ b/ym-packing/src/main/java/com/cnbm/packing/service/WoPackagingBoxServiceBiz.java @@ -57,5 +57,5 @@ public interface WoPackagingBoxServiceBiz extends CrudService> subIdPage(SubIdQueryParam param); - void setColor(List list); +// void setColor(List list); } \ No newline at end of file diff --git a/ym-packing/src/main/java/com/cnbm/packing/service/WoPackagingBoxSubstrateServiceBiz.java b/ym-packing/src/main/java/com/cnbm/packing/service/WoPackagingBoxSubstrateServiceBiz.java index 0acf97e..9118ccd 100644 --- a/ym-packing/src/main/java/com/cnbm/packing/service/WoPackagingBoxSubstrateServiceBiz.java +++ b/ym-packing/src/main/java/com/cnbm/packing/service/WoPackagingBoxSubstrateServiceBiz.java @@ -47,5 +47,5 @@ public interface WoPackagingBoxSubstrateServiceBiz extends CrudService list); +// void setColor(List list); } \ No newline at end of file diff --git a/ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingBoxServiceBizImpl.java b/ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingBoxServiceBizImpl.java index c9970f5..833ffd4 100644 --- a/ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingBoxServiceBizImpl.java +++ b/ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingBoxServiceBizImpl.java @@ -140,7 +140,7 @@ public class WoPackagingBoxServiceBizImpl extends CrudServiceImpl wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(entity.getBoxNo()), WoPackagingBoxSubstrate.PACKAGING_BOX_ID, entity.getBoxNo()); wrapper.orderByAsc(WoPackagingBoxSubstrate.SLOT); @@ -251,6 +251,7 @@ public class WoPackagingBoxServiceBizImpl extends CrudServiceImpl list) { list.forEach(e -> { @@ -404,5 +405,6 @@ public class WoPackagingBoxServiceBizImpl extends CrudServiceImpl list) { list.forEach(e -> { @@ -381,4 +382,5 @@ public class WoPackagingBoxSubstrateServiceBizImpl extends CrudServiceImpl select * from t_change_packaging_box_history + valid = 1 and create_time BETWEEN #{startTime} AND #{endTime} diff --git a/ym-packing/src/main/resources/mapper/PrintModleMapper.xml b/ym-packing/src/main/resources/mapper/PrintModleMapper.xml index 9573d50..6d66e64 100644 --- a/ym-packing/src/main/resources/mapper/PrintModleMapper.xml +++ b/ym-packing/src/main/resources/mapper/PrintModleMapper.xml @@ -24,10 +24,14 @@ + + + diff --git a/ym-packing/src/main/resources/mapper/WoCompensationPowerMapper.xml b/ym-packing/src/main/resources/mapper/WoCompensationPowerMapper.xml index 82a08ab..b912989 100644 --- a/ym-packing/src/main/resources/mapper/WoCompensationPowerMapper.xml +++ b/ym-packing/src/main/resources/mapper/WoCompensationPowerMapper.xml @@ -27,6 +27,7 @@ diff --git a/ym-packing/src/main/resources/mapper/WoPackagingBoxMapper.xml b/ym-packing/src/main/resources/mapper/WoPackagingBoxMapper.xml index 530236b..c48606a 100644 --- a/ym-packing/src/main/resources/mapper/WoPackagingBoxMapper.xml +++ b/ym-packing/src/main/resources/mapper/WoPackagingBoxMapper.xml @@ -36,6 +36,7 @@ diff --git a/ym-packing/src/main/resources/mapper/WoPackagingBoxSubstrateMapper.xml b/ym-packing/src/main/resources/mapper/WoPackagingBoxSubstrateMapper.xml index 9b6ee60..494004d 100644 --- a/ym-packing/src/main/resources/mapper/WoPackagingBoxSubstrateMapper.xml +++ b/ym-packing/src/main/resources/mapper/WoPackagingBoxSubstrateMapper.xml @@ -145,7 +145,8 @@ select * from t_wo_packaging_print_history + where valid = 1 order by id asc diff --git a/ym-packing/src/main/resources/mapper/WoPowerLevelMapper.xml b/ym-packing/src/main/resources/mapper/WoPowerLevelMapper.xml index 78dd952..403a3dd 100644 --- a/ym-packing/src/main/resources/mapper/WoPowerLevelMapper.xml +++ b/ym-packing/src/main/resources/mapper/WoPowerLevelMapper.xml @@ -25,6 +25,7 @@