Merge branch '0.8.X' of https://gitee.com/hdka/klp-oa into 0.8.X

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

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("执行任务监听器...");
-    }
 
+    }
 }

klp-ui/src/views/workflow/work/detail.vue

@@ -42,6 +42,10 @@
                     {{ item.nickName }}
                   </el-tag>
                   <el-button class="button-new-tag" type="primary" icon="el-icon-plus" size="mini" circle @click="onSelectNextUsers" />
+                  <div class="form-item-tip">
+                    <i class="el-icon-info"></i>
+                    <span>您可以指定下一个任务的处理人，系统将自动将任务分配给指定的人员</span>
+                  </div>
                 </el-form-item>
               </el-form>
             </el-col>
@@ -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;
+  }
+}
 </style>

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

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

klp-wms/src/main/java/com/klp/domain/vo/WmsPurchasePlanDetailVo.java

@@ -111,4 +111,9 @@ public class WmsPurchasePlanDetailVo {
      * 合同编号
      */
     private String contractNo;
+
+    /**
+     * 详情编号
+     */
+    private String detailCode;
 }

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

klp-wms/src/main/resources/mapper/klp/WmsPurchasePlanDetailMapper.xml

@@ -21,6 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy" column="update_by"/>
         <result property="contractId" column="contract_id"/>
         <result property="supplierId" column="supplier_id"/>
+        <result property="detailCode" column="detail_code"/>
     </resultMap>
     <select id="selectVoPagePlus" resultType="com.klp.domain.vo.WmsPurchasePlanDetailVo">
     <!-- 联查材料名称编码 -->