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

字段变更

Browse Source
This commit is contained in:
闫阳
2024-01-30 09:42:37 +08:00
parent 8c3d387257
commit c8aad62eb4
37 changed files with 219 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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()==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);
}

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

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,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;
}

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

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

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 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";
}

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,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";
}

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

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

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

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

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

@@ -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>

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

@@ -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>

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

@@ -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>

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

@@ -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">

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

@@ -145,7 +145,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>

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

@@ -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>

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

@@ -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>