gognyi

src/main/java/org/jeecg/modules/appInterface/controller/FbsWorkingStatisticsController.java

@@ -238,7 +238,19 @@ public class FbsWorkingStatisticsController {
 
 		 fbsWorkingStatisticsService.save(entity);
          fbsWorkshopDispatchListService.updateState("1",list.get(0).getId());
-
+			//更新工艺流程
+         FbsWorkshopDispatchList fbsWorkshopDispatchList=new FbsWorkshopDispatchList();
+		 fbsWorkshopDispatchList.setId(list.get(0).getId());
+		 //如果没有直接修改
+		 if(list.get(0).getFbsTechnologicalProcessItemName()==null||list.get(0).getFbsTechnologicalProcessItemName().equals("")){
+			 fbsWorkshopDispatchList.setFbsTechnologicalProcessItemName(entity.getFbsTechnologicalProcessItemName());
+		 }else {
+		 	//是否有同个流程  没有则累加到后面
+		 	if(list.get(0).getFbsTechnologicalProcessItemName().indexOf("entity.getFbsTechnologicalProcessItemName()")==-1){
+				fbsWorkshopDispatchList.setFbsTechnologicalProcessItemName(list.get(0).getFbsTechnologicalProcessItemName()+"=>"+entity.getFbsTechnologicalProcessItemName());
+			}
+		 }
+		 fbsWorkshopDispatchListService.updateById(fbsWorkshopDispatchList);
 		 res.setCode("0");
 		 res.setMsg("成功");
 		 res.setData(entity);
@@ -836,7 +848,7 @@ public class FbsWorkingStatisticsController {
 		 map.put("startDate",entity.getPlannedStartTime());
 		 map.put("endDate",entity.getPlannedEndTime());
 		 map.put("plannedQuantity",entity.getPlannedQuantity());
-		 map.put("fbsTechnologicalProcessItemList",mapList);
+		 map.put("fbsTechnologicalProcessItemList",mapList);//工艺下拉集合
 		 res.setCode("0");
 		 res.setMsg("成功");
 		 res.setData(map);

src/main/java/org/jeecg/modules/fbsWorkshopDispatchList/controller/FbsWorkshopDispatchListController.java

@@ -172,8 +172,23 @@ public class FbsWorkshopDispatchListController {
 				fbsWorkshopDispatchList.setFirstTime(fbsWorkshopDispatchListTime.getFirstTime());
 				fbsWorkshopDispatchList.setFinalTime(fbsWorkshopDispatchListTime.getFinalTime());
 			}
+		}
 
+		List<FbsWorkshopDispatchList> fbsWorkshopDispatchListList1=new ArrayList<>();
+		for(FbsWorkshopDispatchList fbsWorkshopDispatchList:fbsWorkshopDispatchListList){
+			boolean isC=false;
+			for(FbsWorkshopDispatchList fbsWorkshopDispatchList1:fbsWorkshopDispatchListList1){
+				if(fbsWorkshopDispatchList.getProductionOrderNumberName().equals(fbsWorkshopDispatchList1.getProductionOrderNumberName())){
+					isC=true;
+				}
+			}
+			if(isC==false){
+				fbsWorkshopDispatchListList1.add(fbsWorkshopDispatchList);
+			}
 		}
+
+
+
 	 }
 	
 	/**

src/main/java/org/jeecg/modules/fbsWorkshopDispatchList/entity/FbsWorkshopDispatchList.java

@@ -134,6 +134,9 @@ public class FbsWorkshopDispatchList implements Serializable {
 
 	//U8计划数量
 	private BigDecimal plannedQuantity;
+	//U8计划数量合计
+	@TableField(exist = false)
+	private BigDecimal plannedQuantityTotal;
 	//U8标准工时
 	private String standardWorkingHoursZ;
 

src/main/java/org/jeecg/modules/fbsWorkshopDispatchList/mapper/xml/FbsWorkshopDispatchListMapper.xml

@@ -368,7 +368,8 @@
             fwdl.number_of_tasks,
         <!--fws.qualified_number,-->
             fwdl.product_id,
-            fwdl.latest_completed_quantity
+            fwdl.latest_completed_quantity,
+            fwdl.fbs_technological_process_item_name
         FROM
           fbs_workshop_dispatch_list fwdl
         <!--LEFT JOIN fbs_working_statistics fws ON fwdl.id = fws.pk_workshop_dispatch_list