物资流程人员配置

src/main/java/com/jeeplus/modules/act/service/ActTaskService.java

@@ -122,6 +122,8 @@ public class ActTaskService extends BaseService {
     private AdvanceService advanceService;
     @Autowired
     private OaNotifyService oaNotifyService;
+    @Autowired
+    private PickIngService pickIngService;
 
     /**
      * 获取待办任务列表
@@ -2684,7 +2686,6 @@ public class ActTaskService extends BaseService {
         ShowList showList = new ShowList();
         showList.setAct(act);
         List<ShowList> newTemList = showListService.findNewTemList(showList);
-        PickIngService pickIngService = new PickIngService();
         pickIngService.processList(newTemList);
         Project wzUser = MyActiviUtils.findWZUser(act.getProcInsId());
         // 提交流程任务
@@ -2712,7 +2713,7 @@ public class ActTaskService extends BaseService {
         // 提交流程任务
         Map<String, Object> vars = Maps.newHashMap();
         vars.put("pass", "yes".equals(flag) ? true : false);
-        Project user = MyActiviUtils.findUser(act.getProcInsId());
+        Project user = MyActiviUtils.findWZUser(act.getProcInsId());
         String loginName = UserUtils.getByUserName(user.getConstructionUnitRole()).getLoginName();
         String loginName1 = UserUtils.getByUserName(user.getConstructionUnitManage()).getLoginName();
         vars.put("manager", "yes".equals(flag) ? loginName : loginName1);
@@ -2736,7 +2737,7 @@ public class ActTaskService extends BaseService {
         // 提交流程任务
         Map<String, Object> vars = Maps.newHashMap();
         vars.put("pass", "yes".equals(flag) ? true : false);
-        Project user = MyActiviUtils.findUser(act.getProcInsId());
+        Project user = MyActiviUtils.findWZUser(act.getProcInsId());
         String loginName = UserUtils.getByUserName(user.getProjectManageRole()).getLoginName();
         String loginName1 = UserUtils.getByUserName(user.getConstructionUnitLeader()).getLoginName();
         vars.put("manager", "yes".equals(flag) ? loginName : loginName1);
@@ -2763,7 +2764,7 @@ public class ActTaskService extends BaseService {
             showListService.updateManagerTime(act.getProcInsId());
         }
         vars.put("pass", "yes".equals(flag) ? true : false);
-        Project user = MyActiviUtils.findUser(act.getProcInsId());
+        Project user = MyActiviUtils.findWZUser(act.getProcInsId());
         String loginName = UserUtils.getByUserName(user.getDistributionMaterials()).getLoginName();
         vars.put("manager", "yes".equals(flag) ? "" : loginName);
         complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
@@ -2786,7 +2787,7 @@ public class ActTaskService extends BaseService {
         // 提交流程任务
         Map<String, Object> vars = Maps.newHashMap();
         vars.put("pass", "yes".equals(flag) ? true : false);
-        Project user = MyActiviUtils.findUser(act.getProcInsId());
+        Project user = MyActiviUtils.findWZUser(act.getProcInsId());
         String loginName = UserUtils.getByUserName(user.getDistributionMaterials()).getLoginName();
         String loginName1 = UserUtils.getByUserName(user.getProjectManageRole()).getLoginName();
         vars.put("manager", "yes".equals(flag) ? loginName : loginName1);
@@ -2810,7 +2811,7 @@ public class ActTaskService extends BaseService {
         // 提交流程任务
         Map<String, Object> vars = Maps.newHashMap();
         vars.put("pass", "yes".equals(flag) ? true : false);
-        Project user = MyActiviUtils.findUser(act.getProcInsId());
+        Project user = MyActiviUtils.findWZUser(act.getProcInsId());
         String loginName = UserUtils.getByUserName(user.getManagementLeader()).getLoginName();
         String loginName1 = UserUtils.getByUserName(user.getProjectManageRole()).getLoginName();
         vars.put("manager", "yes".equals(flag) ? loginName : loginName1);

src/main/java/com/jeeplus/modules/act/web/ActTaskController.java

@@ -1337,7 +1337,7 @@ public class ActTaskController extends BaseController {
                 a.preInsert();
                 a.setProcInsId(act.getProcInsId());
             }
-            pickIngService.processList(showLists);
+            pickIngService.delAllTem();
             pickIngService.processTemList(showLists);
             String comment = URLDecoder.decode(act.getComment(), "UTF-8");
             act.setComment(comment);

src/main/java/com/jeeplus/modules/sg/picking/activiti/mapper/PickIngMapper.java

@@ -34,6 +34,8 @@ public interface PickIngMapper extends BaseMapper<PickIng> {
 
     void updateSelectVersion(String version);
 
+    void delAllTem();
+
     /**
      * 插入领料清单
      * */

src/main/java/com/jeeplus/modules/sg/picking/activiti/mapper/xml/PickIngMapper.xml

@@ -118,6 +118,10 @@
 	<update id="updateSelectVersion">
 		UPDATE sys_dict_value set `value` = #{version} where id = '1010101010'
 	</update>
+
+	<delete id="delAllTem">
+		TRUNCATE md_temporary_list
+	</delete>
 	
 	<insert id="processList">
 		insert into md_process_list (

src/main/java/com/jeeplus/modules/sg/picking/activiti/service/PickIngService.java

@@ -170,6 +170,14 @@ public class PickIngService extends CrudService<PickIngMapper, PickIng> {
 	}
 
 	/**
+	 * 清空所有临时表的数据
+	 * */
+	@Transactional(readOnly = false)
+	public void delAllTem() {
+		pickIngMapper.delAllTem();
+	}
+
+	/**
 	 * 插入临时领料清单
 	 * */
 	@Transactional(readOnly = false)