diff --git a/klp-admin/src/main/resources/db/migration/V4__newSql.sql b/klp-admin/src/main/resources/db/migration/V4__newSql.sql
new file mode 100644
index 00000000..79727e22
--- /dev/null
+++ b/klp-admin/src/main/resources/db/migration/V4__newSql.sql
@@ -0,0 +1,6 @@
+alter table wms_purchase_plan_detail
+ modify plan_id bigint null comment '采购计划ID';
+
+alter table wms_purchase_plan_detail
+ add detail_code varchar(64) null comment '详情编码' after plan_id;
+
diff --git a/klp-flowable/src/main/java/com/klp/flowable/listener/UserTaskListener.java b/klp-flowable/src/main/java/com/klp/flowable/listener/UserTaskListener.java
index 1ec6011c..ec3cb85f 100644
--- a/klp-flowable/src/main/java/com/klp/flowable/listener/UserTaskListener.java
+++ b/klp-flowable/src/main/java/com/klp/flowable/listener/UserTaskListener.java
@@ -4,6 +4,8 @@ import org.flowable.engine.delegate.TaskListener;
import org.flowable.task.service.delegate.DelegateTask;
import org.springframework.stereotype.Component;
+
+
/**
* 用户任务监听器
*
@@ -20,8 +22,7 @@ public class UserTaskListener implements TaskListener {
@Override
public void notify(DelegateTask delegateTask) {
- //TODO 实现你的任务监听器逻辑
System.out.println("执行任务监听器...");
- }
+ }
}
diff --git a/klp-ui/src/views/workflow/work/detail.vue b/klp-ui/src/views/workflow/work/detail.vue
index 43c5ca21..e36e7b10 100644
--- a/klp-ui/src/views/workflow/work/detail.vue
+++ b/klp-ui/src/views/workflow/work/detail.vue
@@ -42,6 +42,10 @@
{{ item.nickName }}
+
+
+ 您可以指定下一个任务的处理人,系统将自动将任务分配给指定的人员
+
@@ -651,4 +655,16 @@ export default {
.button-new-tag {
margin-left: 10px;
}
+
+.form-item-tip {
+ margin-top: 8px;
+ font-size: 12px;
+ color: #909399;
+ line-height: 1.5;
+
+ i {
+ margin-right: 4px;
+ color: #E6A23C;
+ }
+}
diff --git a/klp-wms/src/main/java/com/klp/domain/WmsPurchasePlanDetail.java b/klp-wms/src/main/java/com/klp/domain/WmsPurchasePlanDetail.java
index 3e2bd9c3..98c98299 100644
--- a/klp-wms/src/main/java/com/klp/domain/WmsPurchasePlanDetail.java
+++ b/klp-wms/src/main/java/com/klp/domain/WmsPurchasePlanDetail.java
@@ -73,4 +73,9 @@ public class WmsPurchasePlanDetail extends BaseEntity {
*/
private Long contractId;
+ /**
+ * 详情编号
+ */
+ private String detailCode;
+
}
diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsPurchasePlanDetailBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsPurchasePlanDetailBo.java
index 8fa5da79..37e3c605 100644
--- a/klp-wms/src/main/java/com/klp/domain/bo/WmsPurchasePlanDetailBo.java
+++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsPurchasePlanDetailBo.java
@@ -75,5 +75,10 @@ public class WmsPurchasePlanDetailBo extends BaseEntity {
*/
private Long contractId;
+ /**
+ * 详情编号
+ */
+ private String detailCode;
+
}
diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsPurchasePlanDetailVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsPurchasePlanDetailVo.java
index 721da3f6..185db049 100644
--- a/klp-wms/src/main/java/com/klp/domain/vo/WmsPurchasePlanDetailVo.java
+++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsPurchasePlanDetailVo.java
@@ -111,4 +111,9 @@ public class WmsPurchasePlanDetailVo {
* 合同编号
*/
private String contractNo;
+
+ /**
+ * 详情编号
+ */
+ private String detailCode;
}
diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsPurchasePlanDetailServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsPurchasePlanDetailServiceImpl.java
index 19505ce5..cbb7e864 100644
--- a/klp-wms/src/main/java/com/klp/service/impl/WmsPurchasePlanDetailServiceImpl.java
+++ b/klp-wms/src/main/java/com/klp/service/impl/WmsPurchasePlanDetailServiceImpl.java
@@ -66,6 +66,7 @@ public class WmsPurchasePlanDetailServiceImpl implements IWmsPurchasePlanDetailS
lqw.eq(StringUtils.isNotBlank(bo.getOwner()), WmsPurchasePlanDetail::getOwner, bo.getOwner());
lqw.eq(bo.getQuantity() != null, WmsPurchasePlanDetail::getQuantity, bo.getQuantity());
lqw.eq(StringUtils.isNotBlank(bo.getUnit()), WmsPurchasePlanDetail::getUnit, bo.getUnit());
+ lqw.like(StringUtils.isNotBlank(bo.getDetailCode()), WmsPurchasePlanDetail::getDetailCode, bo.getDetailCode());
return lqw;
}
@@ -78,6 +79,7 @@ public class WmsPurchasePlanDetailServiceImpl implements IWmsPurchasePlanDetailS
qw.eq(StringUtils.isNotBlank(bo.getOwner()), "wpd.owner", bo.getOwner());
qw.eq(bo.getQuantity() != null, "wpd.quantity", bo.getQuantity());
qw.eq(StringUtils.isNotBlank(bo.getUnit()), "wpd.unit", bo.getUnit());
+ qw.like(StringUtils.isNotBlank(bo.getDetailCode()), "wpd.detail_code", bo.getDetailCode());
return qw;
}
diff --git a/klp-wms/src/main/resources/mapper/klp/WmsPurchasePlanDetailMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsPurchasePlanDetailMapper.xml
index 6e16aabf..f117e1c8 100644
--- a/klp-wms/src/main/resources/mapper/klp/WmsPurchasePlanDetailMapper.xml
+++ b/klp-wms/src/main/resources/mapper/klp/WmsPurchasePlanDetailMapper.xml
@@ -21,6 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+