DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '0.8.X' of http://49.232.154.205:10100/DeXun/klp-oa into 0.8.X

Browse Source
This commit is contained in:
砂糖
2026-06-26 11:44:03 +08:00
parent 97c9a3741a 40c2f83589
commit dc47a91d0f
8 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
klp-wms/src/main/java/com/klp/controller/WmsMaterialCoilController.java
View File

@@ -210,7 +210,8 @@ public class WmsMaterialCoilController extends BaseController {
columns.put("scheduleThickness", "排产厚度");
columns.put("theoreticalLength", "理论长度");
columns.put("rawMaterialThickness", "原料厚度");
columns.put("chromePlateCoilNo", "镀铬卷号");
columns.put("chromePlateCoilNo", "工序卷号");
columns.put("thicknessDifference", "厚度差");
return R.ok(columns);
}

2
klp-wms/src/main/java/com/klp/domain/WmsMaterialCoil.java
View File

@@ -230,7 +230,7 @@ public class WmsMaterialCoil extends BaseEntity {
private BigDecimal theoreticalLength;
/**
* 镀铬卷号
* 工序卷号
*/
private String chromePlateCoilNo;

2
klp-wms/src/main/java/com/klp/domain/bo/WmsMaterialCoilBo.java
View File

@@ -408,7 +408,7 @@ public class WmsMaterialCoilBo extends BaseEntity {
private BigDecimal theoreticalLength;
/**
* 镀铬卷号
* 工序卷号
*/
private String chromePlateCoilNo;

5
klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilAllExportVo.java
View File

@@ -237,7 +237,7 @@ public class WmsMaterialCoilAllExportVo {
@ExcelProperty(value = "理论长度")
private String theoreticalLength;
@ExcelProperty(value = "镀铬卷号")
@ExcelProperty(value = "工序卷号")
private String chromePlateCoilNo;
@ExcelProperty(value = "实测长度")
@@ -245,4 +245,7 @@ public class WmsMaterialCoilAllExportVo {
@ExcelProperty(value = "实测宽度")
private String actualWidth;
@ExcelProperty(value = "厚度差")
private String thicknessDifference;
}

4
klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilExportVo.java
View File

@@ -229,9 +229,9 @@ public class WmsMaterialCoilExportVo {
private BigDecimal theoreticalLength;
/**
* 镀铬卷号
* 工序卷号
*/
@ExcelProperty(value = "镀铬卷号")
@ExcelProperty(value = "工序卷号")
private String chromePlateCoilNo;
/**

2
klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilVo.java
View File

@@ -356,7 +356,7 @@ public class WmsMaterialCoilVo extends BaseEntity {
private BigDecimal theoreticalLength;
/**
* 镀铬卷号
* 工序卷号
*/
private String chromePlateCoilNo;

13
klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java
View File

@@ -1057,7 +1057,7 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
qw.eq(bo.getScheduleThickness() != null, "mc.schedule_thickness", bo.getScheduleThickness());
// 理论长度
qw.eq(bo.getTheoreticalLength() != null, "mc.theoretical_length", bo.getTheoreticalLength());
// 镀铬卷号
// 工序卷号
qw.like(StringUtils.isNotBlank(bo.getChromePlateCoilNo()), "mc.chrome_plate_coil_no", bo.getChromePlateCoilNo());
// 生产开始时间
qw.eq(bo.getProductionStartTime() != null, "mc.production_start_time", bo.getProductionStartTime());
@@ -3807,6 +3807,17 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
String isRelatedText = vo.getIsRelatedToOrder() == 0 ? "否" : "是";
vo.setIsRelatedToOrderText(isRelatedText);
}
// 计算厚度差：理论厚度 - 实际厚度
if (vo.getTheoreticalThickness() != null && vo.getActualThickness() != null) {
try {
BigDecimal theory = new BigDecimal(vo.getTheoreticalThickness());
BigDecimal actual = new BigDecimal(vo.getActualThickness());
vo.setThicknessDifference(theory.subtract(actual).toString());
} catch (NumberFormatException ignored) {
// 解析失败则留空
}
}
}
}

2
klp-wms/src/main/resources/mapper/klp/WmsMaterialCoilMapper.xml
View File

@@ -521,7 +521,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
mc.schedule_thickness AS scheduleThickness,
-- 理论长度
mc.theoretical_length AS theoreticalLength,
-- 镀铬卷号
-- 工序卷号
mc.chrome_plate_coil_no AS chromePlateCoilNo,
-- 库存状态（中文显示）
CASE