CaiXiang/cigs4
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: CaiXiang:c90631c2055950823ddc36470dc2165597b5c946
Branches Tags
CaiXiang:master
CaiXiang:yanyang
CaiXiang:cicd
CaiXiang:dynamicDs
..
compare: CaiXiang:8c3d387257d22882e5519d0863a4b88d5398b655
Branches Tags
CaiXiang:master
CaiXiang:yanyang
CaiXiang:cicd
CaiXiang:dynamicDs

No commits in common. "c90631c2055950823ddc36470dc2165597b5c946" and "8c3d387257d22882e5519d0863a4b88d5398b655" have entirely different histories.
c90631c205 ... 8c3d387257

37 changed files with 60 additions and 219 deletions
Show Stats Expand all files Collapse all files

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

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

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

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

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

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

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

@ -14,7 +14,7 @@ import java.math.BigDecimal;
* 包装箱表
*
* @author codeGenerator
* @since 2024-01-29
* @since 2023-02-23
*/
@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,16 +113,4 @@ 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;
}

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

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

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

@ -14,7 +14,7 @@ import lombok.Data;
* </p>
*
* @author codeGenerator
* @since 2024-01-29
* @since 2023-02-23
*/
@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,18 +114,6 @@ 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";
@ -187,12 +175,4 @@ 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";
}

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

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

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

@ -12,7 +12,7 @@ import java.util.Date;
* 包装箱表
*
* @author codeGenerator
* @since 2024-01-29
* @since 2023-02-23
*/
@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,13 +76,5 @@ 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;
}

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

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

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

@ -23,9 +23,6 @@
<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>

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

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

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

@ -32,10 +32,6 @@
<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>

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

@ -1,7 +1,7 @@
-- 菜单初始SQL
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());
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());

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

@ -1,7 +1,7 @@
-- 菜单初始SQL
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());
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());

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

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

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

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

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

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

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

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

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

@ -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);
}

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

@ -283,7 +283,7 @@ public class WoPackagingBoxSubstrateController {
//验证该模组的线体、功率等级是否BoxID的线体、功率等级一致，一致，保存成功，数据发生更新。不一致，则显示保存失败，数据不发生更新
WoPackagingBox box = woPackagingBoxMapper.selectList(boxQueryWrapper).get(0);
if((substrate.getLineBody().equals(box.getLineBody())) && (substrate.getPowerLevel().equals(box.getPowerLevel())) )
if((substrate.getLineBody()==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);
}

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

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

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

@ -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,16 +118,7 @@ public class WoPackagingBoxDTO implements Serializable {
@ApiModelProperty(value = "基板列表")
private List<WoPackagingBoxSubstrate> substrateList;
@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;
@ApiModelProperty(value = "颜色（物料号匹配）")
private String color;
}

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

@ -185,16 +185,7 @@ public class WoPackagingBoxSubstrateDTO implements Serializable {
@ApiModelProperty(value = "最近打印时间(转)")
private String printTime1;
@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;
@ApiModelProperty(value = "颜色（物料号匹配）")
private String color;
}

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

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

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

@ -41,7 +41,7 @@ public class WoPackagingBox implements Serializable {
@ApiModelProperty("等级（舍弃）")
private Integer grade;
@ApiModelProperty("基板数量，每个包装箱最大20片")
@ApiModelProperty("基板数量，每个包装箱最大20片（舍弃）")
private Integer substrateQuantity;
@ApiModelProperty("装箱完成时间，指的是包装完成时间")
@ -114,18 +114,6 @@ 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";
@ -187,12 +175,4 @@ 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";
}

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

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

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

@ -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);
}

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

@ -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);
}

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

@ -140,7 +140,7 @@ 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);
@ -251,7 +251,6 @@ public class WoPackagingBoxServiceBizImpl extends CrudServiceImpl<WoPackagingBox
return R.ok(iPage);
}
/*
@Override
public void setColor(List<WoPackagingBoxDTO> list) {
list.forEach(e -> {
@ -405,6 +404,5 @@ public class WoPackagingBoxServiceBizImpl extends CrudServiceImpl<WoPackagingBox
}
}
}
*/
}

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

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

1
ym-packing/src/main/resources/mapper/ChangePackagingBoxHistoryMapper.xml
View File

@ -25,7 +25,6 @@
<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>

4
ym-packing/src/main/resources/mapper/PrintModleMapper.xml
View File

@ -24,14 +24,10 @@
<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>

1
ym-packing/src/main/resources/mapper/WoCompensationPowerMapper.xml
View File

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

1
ym-packing/src/main/resources/mapper/WoPackagingBoxMapper.xml
View File

@ -36,7 +36,6 @@
<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">

3
ym-packing/src/main/resources/mapper/WoPackagingBoxSubstrateMapper.xml
View File

@ -145,8 +145,7 @@
<select id="substratePage" resultType="com.cnbm.packing.dto.WoPackagingBoxSubstrateDTO">
select
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
twpb.CREATE_TIME as boxCreateTime,twpbs.*,twpb.PRINT_TIME as printTime
from t_wo_packaging_box_substrate twpbs
left join t_wo_packaging_box twpb on twpbs.PACKAGING_BOX_ID = twpb.BOX_NO
<where>

1
ym-packing/src/main/resources/mapper/WoPackagingPrintHistoryMapper.xml
View File

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

1
ym-packing/src/main/resources/mapper/WoPowerLevelMapper.xml
View File

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