diff --git a/klp-flow/src/main/java/com/klp/flow/domain/SchProdScheduleItem.java b/klp-flow/src/main/java/com/klp/flow/domain/SchProdScheduleItem.java
index f888ece07..ef0cf17e2 100644
--- a/klp-flow/src/main/java/com/klp/flow/domain/SchProdScheduleItem.java
+++ b/klp-flow/src/main/java/com/klp/flow/domain/SchProdScheduleItem.java
@@ -131,6 +131,10 @@ public class SchProdScheduleItem extends BaseEntity {
* 排产明细关联主表ID（逗号分隔，未合并存单值，合并后存多个）
*/
private String scheduleDetailIds;
+ /**
+ * 工序类型
+ */
+ private String actionType;
/**
* 规格 例：1.0X1250
*/
diff --git a/klp-flow/src/main/java/com/klp/flow/domain/bo/SchProdScheduleItemBo.java b/klp-flow/src/main/java/com/klp/flow/domain/bo/SchProdScheduleItemBo.java
index c2fbd5f3f..64a8d0799 100644
--- a/klp-flow/src/main/java/com/klp/flow/domain/bo/SchProdScheduleItemBo.java
+++ b/klp-flow/src/main/java/com/klp/flow/domain/bo/SchProdScheduleItemBo.java
@@ -158,6 +158,11 @@ public class SchProdScheduleItemBo extends BaseEntity {
*/
private String scheduleDetailIds;
+ /**
+ * 工序类型
+ */
+ private String actionType;
+
/**
* 规格 例：1.0X1250
*/
diff --git a/klp-flow/src/main/java/com/klp/flow/domain/vo/SchProdScheduleItemVo.java b/klp-flow/src/main/java/com/klp/flow/domain/vo/SchProdScheduleItemVo.java
index 6adfeb3a5..1dc7f0001 100644
--- a/klp-flow/src/main/java/com/klp/flow/domain/vo/SchProdScheduleItemVo.java
+++ b/klp-flow/src/main/java/com/klp/flow/domain/vo/SchProdScheduleItemVo.java
@@ -189,6 +189,12 @@ public class SchProdScheduleItemVo {
@ExcelProperty(value = "排产明细关联主表ID")
private String scheduleDetailIds;
+ /**
+ * 工序类型
+ */
+ @ExcelProperty(value = "工序类型")
+ private String actionType;
+
/**
* 规格 例：1.0X1250
*/
diff --git a/klp-flow/src/main/java/com/klp/flow/service/impl/SchProdScheduleItemServiceImpl.java b/klp-flow/src/main/java/com/klp/flow/service/impl/SchProdScheduleItemServiceImpl.java
index dee39cfb3..1254fffeb 100644
--- a/klp-flow/src/main/java/com/klp/flow/service/impl/SchProdScheduleItemServiceImpl.java
+++ b/klp-flow/src/main/java/com/klp/flow/service/impl/SchProdScheduleItemServiceImpl.java
@@ -108,6 +108,8 @@ public class SchProdScheduleItemServiceImpl implements ISchProdScheduleItemServi
lqw.eq(bo.getScheduleWeight() != null, SchProdScheduleItem::getScheduleWeight, bo.getScheduleWeight());
lqw.eq(StringUtils.isNotBlank(bo.getProductItem()), SchProdScheduleItem::getProductItem, bo.getProductItem());
lqw.eq(StringUtils.isNotBlank(bo.getRowRemark()), SchProdScheduleItem::getRowRemark, bo.getRowRemark());
+ // actionType
+ lqw.eq(StringUtils.isNotBlank(bo.getActionType()), SchProdScheduleItem::getActionType, bo.getActionType());
return lqw;
}
diff --git a/klp-ui/src/views/wms/post/aps/schedule.vue b/klp-ui/src/views/wms/post/aps/schedule.vue
index 726abd298..6ff6398ec 100644
--- a/klp-ui/src/views/wms/post/aps/schedule.vue
+++ b/klp-ui/src/views/wms/post/aps/schedule.vue
@@ -205,6 +205,7 @@
+
{{ statusMap[scope.row.scheduleStatus] || '未知' }}
@@ -302,12 +303,17 @@
-
-
+
+
+
+
+
+
+
@@ -355,18 +361,18 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -506,10 +512,13 @@
-
+
+
+
+
@@ -657,7 +666,7 @@ export default {
mergeTemplateIndex: 0,
mergeSourceRows: [],
mergeForm: {
- itemCount: 0, scheduleNo: '', customerName: '', spec: '', material: '',
+ itemCount: 0, scheduleNo: '', actionType: '', customerName: '', spec: '', material: '',
scheduleWeight: 0, productType: '', productItem: '', businessUser: '',
businessPhone: '', deliveryCycle: undefined, usePurpose: '',
thicknessTolerance: '', widthTolerance: '', surfaceQuality: '',
@@ -700,6 +709,7 @@ export default {
return {
scheduleId: undefined,
scheduleNo: '',
+ actionType: '',
prodDate: '',
scheduleStatus: undefined,
totalPlanWeight: undefined,
@@ -938,6 +948,7 @@ export default {
this.mergeForm = {
itemCount: this.mergeSourceRows.length,
scheduleNo: row.scheduleNo || '',
+ actionType: row.actionType || '',
customerName: row.customerName || '',
spec: row.spec || '',
material: row.material || '',