Merge remote-tracking branch 'origin/master'

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

@@ -1243,6 +1243,12 @@ public class ActTaskController extends BaseController {
 		AjaxJson j = new AjaxJson();
 		try {
 			pickIngService.updateSelectNumber(selectNumber, act.getProcInsId());
+			List<ShowList> showLists = MyActiviUtils.finaList(selectNumber);
+			for (ShowList a : showLists) {
+				a.preInsert();
+				a.setProcInsId(act.getProcInsId());
+			}
+			pickIngService.processList(showLists);
 			String comment = URLDecoder.decode(act.getComment(), "UTF-8");
 			act.setComment(comment);
 			actTaskService.pickIng(act);

src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/utils/MyActiviUtils.java

@@ -2,12 +2,15 @@ package com.jeeplus.modules.sg.managementcenter.activiti.utils;
 
 import com.jeeplus.common.utils.SpringContextHolder;
 import com.jeeplus.common.utils.StringUtils;
+import com.jeeplus.core.persistence.Page;
 import com.jeeplus.modules.sg.audit.information.service.InformationService;
 import com.jeeplus.modules.sg.managementcenter.activiti.entity.FindTask;
 import com.jeeplus.modules.sg.managementcenter.activiti.entity.MyNeedList;
 import com.jeeplus.modules.sg.managementcenter.activiti.service.ConstructionService;
 import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
 import com.jeeplus.modules.sg.managementcenter.project.service.ProjectService;
+import com.jeeplus.modules.sg.picking.activiti.entity.ShowList;
+import com.jeeplus.modules.sg.picking.activiti.service.ShowListService;
 import com.jeeplus.modules.sys.entity.DictType;
 import com.jeeplus.modules.sys.entity.DictValue;
 import com.jeeplus.modules.sys.service.DictTypeService;
@@ -38,6 +41,7 @@ import org.ehcache.core.spi.service.ExecutionService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 
+import java.math.BigDecimal;
 import java.util.*;
 
 public class MyActiviUtils {
@@ -51,6 +55,8 @@ public class MyActiviUtils {
     private static ProjectService projectService = SpringContextHolder.getBean(ProjectService.class);
     @Autowired
     private static DictTypeService dictTypeService = SpringContextHolder.getBean(DictTypeService.class);
+    @Autowired
+    private static ShowListService showListService = SpringContextHolder.getBean(ShowListService.class);
 
     /**
      * 获取下一个用户任务信息
@@ -233,4 +239,102 @@ public class MyActiviUtils {
         DictValue dictValue = dictTypeService.getDictValue("1010101010");
         return dictValue;
     }
+
+    public static List<ShowList> finaList(String item) {
+        ShowList showList = new ShowList();
+        ArrayList<String> objects = new ArrayList<>();
+        ArrayList<String> findList = new ArrayList<>();
+        List<ShowList> finalList = new ArrayList<>();
+        //返回给页面的list
+        List<ShowList> myList = new ArrayList<>();
+        if (item != null&&!"".equals(item)) {
+            String[] split = item.split(";");
+            //回显list
+            List<ShowList> returnList = new ArrayList<>();
+            for (int i = 0; i < split.length; i++) {
+                objects.add(split[i]);
+            }
+            for (String s : objects) {
+                String[] split1 = s.split(":");
+                ShowList myShow = new ShowList();
+                myShow.setId(split1[0]);
+                String s1 = split1[1];
+                myShow.setNumber(Double.parseDouble(s1));
+                findList.add(split1[0]);
+                myList.add(myShow);
+            }
+            showList.setFindList(findList);
+            List<ShowList> list = showListService.findList(showList);
+            //前端传来选择的模块与数量
+            for (ShowList my : myList) {
+                //循环遍历
+                for (ShowList showList1 : list) {
+                    //选择的模块与查出来的一致
+                    if (my.getId().equals(showList1.getBlockId())) {
+                        Double mdSingleWeight = showList1.getMdSingleWeight();
+                        Double number = my.getNumber();
+                        Double mdCount = showList1.getMdCount();
+                        Double i = mdSingleWeight * number;
+                        BigDecimal b1 = new BigDecimal(Double.toString(number));
+                        BigDecimal b2 = new BigDecimal(Double.toString(mdCount));
+                        double v =  b1.multiply(b2).doubleValue();
+                        ShowList newShowList = new ShowList();
+                        newShowList.setMaterialCode(showList1.getMaterialCode());
+                        newShowList.setMaterialDescription(showList1.getMaterialDescription());
+                        newShowList.setExtensionDescription(showList1.getExtensionDescription());
+                        newShowList.setMdUnits(showList1.getMdUnits());
+                        newShowList.setMdTheParty(showList1.getMdTheParty());
+                        newShowList.setMdText(showList1.getMdText());
+                        newShowList.setMdTotalAmount(v);
+                        newShowList.setMdSingleWeight(showList1.getMdSingleWeight());
+                        BigDecimal b = new BigDecimal(i);
+                        BigDecimal a = new BigDecimal(1000);
+                        BigDecimal divide = b.divide(a, 4, BigDecimal.ROUND_HALF_UP);
+                        newShowList.setMdTotalWeight(Double.valueOf(divide.toString()));
+                        newShowList.setBlockId(showList1.getBlockId());
+                        returnList.add(newShowList);
+                    }
+                }
+            }
+            boolean flag;
+            for (ShowList turn:returnList){
+                flag = true;
+                for (ShowList list1:finalList){
+                    if (turn.getMaterialCode().equals(list1.getMaterialCode()) && turn.getMaterialDescription().equals(list1.getMaterialDescription()) && turn.getExtensionDescription().equals(list1.getExtensionDescription())) {
+                        Double mdTotalAmount = list1.getMdTotalAmount();
+                        Double mdTotalAmount1 = turn.getMdTotalAmount();
+                        BigDecimal b1 = new BigDecimal(Double.toString(mdTotalAmount));
+                        BigDecimal b2 = new BigDecimal(Double.toString(mdTotalAmount1));
+                        double v =  b1.add(b2).doubleValue();
+                        Double mdTotalWeight = list1.getMdTotalWeight();
+                        Double mdTotalWeight1 = turn.getMdTotalWeight();
+                        BigDecimal a1 = new BigDecimal(Double.toString(mdTotalWeight));
+                        BigDecimal a2 = new BigDecimal(Double.toString(mdTotalWeight1));
+                        double  b=  a1.add(a2).doubleValue();
+                        list1.setMdTotalAmount(v);
+                        list1.setMdTotalWeight(b);
+                        flag = false;
+                        break;
+                    }
+                }
+                if (flag){
+                    showList = new ShowList();
+                    showList.setMaterialCode(turn.getMaterialCode());
+                    showList.setMaterialDescription(turn.getMaterialDescription());
+                    showList.setExtensionDescription(turn.getExtensionDescription());
+                    showList.setMdUnits(turn.getMdUnits());
+                    showList.setMdTheParty(turn.getMdTheParty());
+                    showList.setMdText(turn.getMdText());
+                    showList.setMdTotalAmount(turn.getMdTotalAmount());
+                    showList.setMdSingleWeight(turn.getMdSingleWeight());
+                    showList.setMdTotalWeight(turn.getMdTotalWeight());
+                    showList.setBlockId(turn.getBlockId());
+                    finalList.add(showList);
+                }
+            }
+            Collections.sort(finalList);
+        }
+        return finalList;
+    }
 }
+

src/main/java/com/jeeplus/modules/sg/picking/activiti/entity/ShowList.java

@@ -29,7 +29,7 @@ public class ShowList extends ActEntity<ShowList> implements Comparable<ShowList
     //总重/吨;
     private Double mdTotalWeight;
     //甲乙供;
-    private String meTheParty;
+    private String mdTheParty;
     //备注;
     private String mdText;
     //数量
@@ -84,13 +84,12 @@ public class ShowList extends ActEntity<ShowList> implements Comparable<ShowList
     }
 
 
-
-    public String getMeTheParty() {
-        return meTheParty;
+    public String getMdTheParty() {
+        return mdTheParty;
     }
 
-    public void setMeTheParty(String meTheParty) {
-        this.meTheParty = meTheParty;
+    public void setMdTheParty(String mdTheParty) {
+        this.mdTheParty = mdTheParty;
     }
 
     public String getMdText() {

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

@@ -5,6 +5,7 @@ package com.jeeplus.modules.sg.picking.activiti.mapper;
 
 import com.jeeplus.core.persistence.BaseMapper;
 import com.jeeplus.core.persistence.annotation.MyBatisMapper;
+import com.jeeplus.modules.sg.audit.information.entity.Information;
 import com.jeeplus.modules.sg.managementcenter.activiti.entity.Construction;
 import com.jeeplus.modules.sg.picking.activiti.entity.PickIng;
 import com.jeeplus.modules.sg.picking.activiti.entity.ProjectNumber;
@@ -35,4 +36,5 @@ public interface PickIngMapper extends BaseMapper<PickIng> {
 
     void updateSelectVersion(String version);
 
+    void processList(List<ShowList> showList);
 }

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

@@ -30,4 +30,6 @@ public interface ShowListMapper extends BaseMapper<ShowList> {
     void projectUpdate(PickApplication pickApplication);
 
     String selectProjectId(String id);
+
+    List<ShowList> findNewList(ShowList showList);
 }

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

@@ -118,4 +118,47 @@
 	<update id="updateSelectVersion">
 				UPDATE sys_dict_value set `value` = #{version} where id = '1010101010'
 	</update>
+	
+	<insert id="processList">
+		insert into md_process_list (
+			id,
+			create_by,
+			create_date,
+			update_by,
+			update_date,
+			del_flag,
+			remarks,
+			procInsId,
+			materialCode,
+			extensionDescription,
+			materialDescription,
+			mdUnits,
+			mdTotalAmount,
+			mdSingleWeight,
+			mdTotalWeight,
+			mdTheParty,
+			mdText
+		 )values
+		<foreach collection="list" item="item" index="showList" separator="," >
+		 (
+			#{item.id},
+			#{item.createBy.id},
+			#{item.createDate},
+			#{item.updateBy.id},
+			#{item.updateDate},
+			#{item.delFlag},
+			#{item.remarks},
+			#{item.procInsId},
+			#{item.materialCode},
+			#{item.extensionDescription},
+			#{item.materialDescription},
+			#{item.mdUnits},
+			#{item.mdTotalAmount},
+			#{item.mdSingleWeight},
+			#{item.mdTotalWeight},
+			#{item.meTheParty},
+			#{item.mdText}
+		 )
+		</foreach>
+	</insert>
 </mapper>

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

@@ -13,7 +13,7 @@
 		a.md_count AS "mdCount",
 		a.md_single_weight AS "mdSingleWeight",
 		a.md_total_weight AS "mdTotalWeight",
-		a.md_the_party AS "meTheParty",
+		a.md_the_party AS "mdTheParty",
 		a.md_text AS "mdText",
 		a.md_total_amount AS "mdTotalAmount",
 		a.block_id AS "blockId"
@@ -148,4 +148,20 @@
 	<select id="selectProjectId" resultType="string">
 		select project_id from md_picking_application where id =#{id}
 	</select>
+
+	<select id="findNewList" resultType="com.jeeplus.modules.sg.picking.activiti.entity.ShowList">
+	SELECT
+		id,
+		procInsId,
+		materialCode,
+		extensionDescription,
+		materialDescription,
+		mdUnits,
+		mdTotalAmount,
+		mdSingleWeight,
+		mdTotalWeight,
+		mdTheParty,
+		mdText
+	from md_process_list where procInsId = #{procInsId}
+	</select>
 </mapper>

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

@@ -11,6 +11,7 @@ import com.jeeplus.modules.sg.managementcenter.activiti.utils.MyActiviUtils;
 import com.jeeplus.modules.sg.picking.activiti.entity.*;
 import com.jeeplus.modules.sg.picking.activiti.mapper.PickIngMapper;
 import com.jeeplus.modules.sys.entity.DictValue;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.method.P;
 import org.springframework.stereotype.Service;
@@ -151,4 +152,8 @@ public class PickIngService extends CrudService<PickIngMapper, PickIng> {
 		pickIngMapper.updateSelectVersion(version);
 	};
 
+	@Transactional(readOnly = false)
+	public void processList(List<ShowList> showList) {
+		pickIngMapper.processList(showList);
+	}
 }

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

@@ -32,6 +32,13 @@ public class ShowListService extends CrudService<ShowListMapper, ShowList> {
 		return super.findPage(page, entity);
 	}
 
+	public Page<ShowList> findNewPage(Page<ShowList> page, ShowList showList) {
+		dataRuleFilter(showList);
+		showList.setPage(page);
+		page.setList(mapper.findNewList(showList));
+		return page;
+	}
+
 
 /*	public Page<ShowList> findNewPage(Page<ShowList> page, ShowList entity) {
 		dataRuleFilter(entity);

src/main/java/com/jeeplus/modules/sg/picking/activiti/web/PickIngController.java

@@ -132,95 +132,13 @@ public class PickIngController extends BaseController {
     }
 
 
-/*    //    manager
+    //    manager
     @ResponseBody
     @RequestMapping(value = "constructionData")
     public Map<String, Object> constructionData(ShowList showList, String procInsId, HttpServletRequest request, HttpServletResponse response, Model model) {
-        String item = pickIngService.findSelectNumber(procInsId);
-        ArrayList<String> objects = new ArrayList<>();
-        ArrayList<String> findList = new ArrayList<>();
-        //返回给页面的list
-        List<ShowList> myList = new ArrayList<>();
-        if (item != null && !"".equals(item)) {
-            String[] split = item.split(";");
-            //回显list
-            List<ShowList> returnList = new ArrayList<>();
-            for (int i = 0; i < split.length; i++) {
-                objects.add(split[i]);
-            }
-            for (String s : objects) {
-                String[] split1 = s.split(":");
-                ShowList myShow = new ShowList();
-                myShow.setId(split1[0]);
-                String s1 = split1[1];
-                myShow.setNumber(Double.parseDouble(s1));
-                findList.add(split1[0]);
-                myList.add(myShow);
-            }
-            showList.setFindList(findList);
-            Page<ShowList> page = showListService.findPage(new Page<ShowList>(request, response), showList);
-            //查询出来所有的模块清单数据
-            List<ShowList> list = page.getList();
-            //前端传来选择的模块与数量
-            for (ShowList my : myList) {
-                //循环遍历
-                for (ShowList showList1 : list) {
-                    //选择的模块与查出来的一致
-                    if (my.getId().equals(showList1.getBlockId())) {
-                        Double mdSingleWeight = showList1.getMdSingleWeight();
-                        Double number = my.getNumber();
-                        Double i = mdSingleWeight * number;
-                        ShowList newShowList = new ShowList();
-                        newShowList.setMaterialCode(showList1.getMaterialCode());
-                        newShowList.setMaterialDescription(showList1.getMaterialDescription());
-                        newShowList.setExtensionDescription(showList1.getExtensionDescription());
-                        newShowList.setMdUnits(showList1.getMdUnits());
-                        newShowList.setMeTheParty(showList1.getMeTheParty());
-                        newShowList.setMdText(showList1.getMdText());
-                        newShowList.setMdTotalAmount(number);
-                        newShowList.setMdSingleWeight(showList1.getMdSingleWeight());
-                        newShowList.setMdTotalWeight(i / 1000);
-                        newShowList.setBlockId(showList1.getBlockId());
-                        returnList.add(newShowList);
-                    }
-                }
-            }
-            List<ShowList> finalList = new ArrayList<>();
-            boolean flag;
-            for (ShowList turn : returnList) {
-                flag = true;
-                for (ShowList list1 : finalList) {
-                    if (turn.getMaterialCode().equals(list1.getMaterialCode()) && turn.getMaterialDescription().equals(list1.getMaterialDescription()) && turn.getExtensionDescription().equals(list1.getExtensionDescription())) {
-                        list1.setMdTotalAmount(list1.getMdTotalAmount() + turn.getMdTotalAmount());
-                        list1.setMdTotalWeight(list1.getMdTotalWeight() + turn.getMdTotalWeight());
-                        flag = false;
-                        break;
-                    }
-                }
-                if (flag) {
-                    showList = new ShowList();
-                    showList.setMaterialCode(turn.getMaterialCode());
-                    showList.setMaterialDescription(turn.getMaterialDescription());
-                    showList.setExtensionDescription(turn.getExtensionDescription());
-                    showList.setMdUnits(turn.getMdUnits());
-                    showList.setMeTheParty(turn.getMeTheParty());
-                    showList.setMdText(turn.getMdText());
-                    showList.setMdTotalAmount(turn.getMdTotalAmount());
-                    showList.setMdSingleWeight(turn.getMdSingleWeight());
-                    showList.setMdTotalWeight(turn.getMdTotalWeight());
-                    showList.setBlockId(turn.getBlockId());
-                    finalList.add(showList);
-                }
-            }
-            page.setList(finalList);
+            Page<ShowList> page = showListService.findNewPage(new Page<ShowList>(request, response), showList);
             return getBootstrapData(page);
-        } else {
-            findList.add("没有数据");
-            showList.setFindList(findList);
-            Page<ShowList> page = showListService.findPage(new Page<ShowList>(request, response), showList);
-            return getBootstrapData(page);
-        }
-    }*/
+    }
 
     /**
      * 领料流程发起

src/main/java/com/jeeplus/modules/sg/picking/activiti/web/ShowListController.java

@@ -73,7 +73,7 @@ public class ShowListController extends BaseController {
                         newShowList.setMaterialDescription(showList1.getMaterialDescription());
                         newShowList.setExtensionDescription(showList1.getExtensionDescription());
                         newShowList.setMdUnits(showList1.getMdUnits());
-                        newShowList.setMeTheParty(showList1.getMeTheParty());
+                        newShowList.setMdTheParty(showList1.getMdTheParty());
                         newShowList.setMdText(showList1.getMdText());
                         newShowList.setMdTotalAmount(v);
                         newShowList.setMdSingleWeight(showList1.getMdSingleWeight());
@@ -114,7 +114,7 @@ public class ShowListController extends BaseController {
                     showList.setMaterialDescription(turn.getMaterialDescription());
                     showList.setExtensionDescription(turn.getExtensionDescription());
                     showList.setMdUnits(turn.getMdUnits());
-                    showList.setMeTheParty(turn.getMeTheParty());
+                    showList.setMdTheParty(turn.getMdTheParty());
                     showList.setMdText(turn.getMdText());
                     showList.setMdTotalAmount(turn.getMdTotalAmount());
                     showList.setMdSingleWeight(turn.getMdSingleWeight());
@@ -186,7 +186,7 @@ public class ShowListController extends BaseController {
                         newShowList.setMaterialDescription(showList1.getMaterialDescription());
                         newShowList.setExtensionDescription(showList1.getExtensionDescription());
                         newShowList.setMdUnits(showList1.getMdUnits());
-                        newShowList.setMeTheParty(showList1.getMeTheParty());
+                        newShowList.setMdTheParty(showList1.getMdTheParty());
                         newShowList.setMdText(showList1.getMdText());
                         newShowList.setMdTotalAmount(v);
                         newShowList.setMdSingleWeight(showList1.getMdSingleWeight());

src/main/webapp/webpage/modules/sg/picking/activiti/constructionLeader.js

@@ -86,7 +86,7 @@ $(document).ready(function() {
 					field: 'mdTotalWeight',
 					title: '总重/吨',
 				}, {
-					field: 'meTheParty',
+					field: 'mdTheParty',
 					title: '甲乙供',
 				}, {
 					field: 'mdText',

src/main/webapp/webpage/modules/sg/picking/activiti/constructionLeader.jsp

@@ -2,7 +2,7 @@
 <%@ include file="/webpage/include/taglib.jsp"%>
 <html>
 <head>
-	<title>项目管理列表页</title>
+	<title>施工单位领导审核</title>
 	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
 	<meta name="decorator" content="ani"/>
 	<%@ include file="/webpage/include/bootstraptable.jsp"%>

src/main/webapp/webpage/modules/sg/picking/activiti/fullTime.js

@@ -86,7 +86,7 @@ $(document).ready(function() {
 					field: 'mdTotalWeight',
 					title: '总重/吨',
 				}, {
-					field: 'meTheParty',
+					field: 'mdTheParty',
 					title: '甲乙供',
 				}, {
 					field: 'mdText',

src/main/webapp/webpage/modules/sg/picking/activiti/pickIng.js

@@ -84,7 +84,7 @@ $(document).ready(function() {
 			   field: 'mdTotalWeight',
 			   title: '总重/吨',
 		   },{
-			   field: 'meTheParty',
+			   field: 'mdTheParty',
 			   title: '甲乙供',
 		   },{
 			   field: 'mdText',
@@ -186,7 +186,7 @@ $(document).ready(function() {
 				field: 'mdTotalWeight',
 				title: '总重/吨',
 			},{
-				field: 'meTheParty',
+				field: 'mdTheParty',
 				title: '甲乙供',
 			},{
 				field: 'mdText',