diff --git a/klp-wms/src/main/java/com/klp/domain/WmsMaterialCoil.java b/klp-wms/src/main/java/com/klp/domain/WmsMaterialCoil.java
index 1c8b5e96..c564360a 100644
--- a/klp-wms/src/main/java/com/klp/domain/WmsMaterialCoil.java
+++ b/klp-wms/src/main/java/com/klp/domain/WmsMaterialCoil.java
@@ -170,5 +170,27 @@ public class WmsMaterialCoil extends BaseEntity {
* 实测宽度
*/
private BigDecimal actualWidth;
+
+ /**
+ * 生产开始时间
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date productionStartTime;
+
+ /**
+ * 生产结束时间
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date productionEndTime;
+
+ /**
+ * 生产耗时(单位:分钟)
+ */
+ private BigDecimal productionDuration;
+
+ /**
+ * 预留宽度(单位:毫米)
+ */
+ private BigDecimal reservedWidth;
}
diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsMaterialCoilBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsMaterialCoilBo.java
index 78c5dbe2..367ccbf6 100644
--- a/klp-wms/src/main/java/com/klp/domain/bo/WmsMaterialCoilBo.java
+++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsMaterialCoilBo.java
@@ -285,5 +285,29 @@ public class WmsMaterialCoilBo extends BaseEntity {
* 实测宽度
*/
private BigDecimal actualWidth;
+
+ /**
+ * 生产开始时间
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date productionStartTime;
+
+ /**
+ * 生产结束时间
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date productionEndTime;
+
+ /**
+ * 生产耗时(单位:分钟)
+ */
+ private BigDecimal productionDuration;
+
+ /**
+ * 预留宽度(单位:毫米)
+ */
+ private BigDecimal reservedWidth;
}
diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilVo.java
index f25a673b..86d37510 100644
--- a/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilVo.java
+++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilVo.java
@@ -446,5 +446,27 @@ public class WmsMaterialCoilVo extends BaseEntity {
*/
@ExcelProperty(value = "实测宽度")
private BigDecimal actualWidth;
+
+ /**
+ * 生产开始时间
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date productionStartTime;
+
+ /**
+ * 生产结束时间
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date productionEndTime;
+
+ /**
+ * 生产耗时(单位:分钟)
+ */
+ private BigDecimal productionDuration;
+
+ /**
+ * 预留宽度(单位:毫米)
+ */
+ private BigDecimal reservedWidth;
}
diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java
index 9b0d4cc2..f5f7faed 100644
--- a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java
+++ b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java
@@ -479,6 +479,14 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
qw.eq(bo.getActualLength() != null, "mc.actual_length", bo.getActualLength());
// 实测宽度
qw.eq(bo.getActualWidth() != null, "mc.actual_width", bo.getActualWidth());
+ // 生产开始时间
+ qw.eq(bo.getProductionStartTime() != null, "mc.production_start_time", bo.getProductionStartTime());
+ // 生产结束时间
+ qw.eq(bo.getProductionEndTime() != null, "mc.production_end_time", bo.getProductionEndTime());
+ // 生产耗时
+ qw.eq(bo.getProductionDuration() != null, "mc.production_duration", bo.getProductionDuration());
+ // 预留宽度
+ qw.eq(bo.getReservedWidth() != null, "mc.reserved_width", bo.getReservedWidth());
// 如果actualWarehouseId不为空,则根据实际库区ID进行查询 如果为-1,则查询无库区的数据
if (bo.getActualWarehouseId() != null) {
if (bo.getActualWarehouseId() == -1) {
diff --git a/klp-wms/src/main/resources/mapper/klp/WmsMaterialCoilMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsMaterialCoilMapper.xml
index 0caad581..88269a67 100644
--- a/klp-wms/src/main/resources/mapper/klp/WmsMaterialCoilMapper.xml
+++ b/klp-wms/src/main/resources/mapper/klp/WmsMaterialCoilMapper.xml
@@ -24,6 +24,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
+
+
+
@@ -104,6 +108,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
mc.length,
mc.actual_length,
mc.actual_width,
+ mc.production_start_time,
+ mc.production_end_time,
+ mc.production_duration,
+ mc.reserved_width,
mc.coating_type,
mc.temper_grade,
mc.business_purpose,
@@ -196,6 +204,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
mc.length,
mc.actual_length,
mc.actual_width,
+ mc.production_start_time,
+ mc.production_end_time,
+ mc.production_duration,
+ mc.reserved_width,
mc.coating_type,
mc.temper_grade,
mc.business_purpose,