异常 派工单

src/main/java/org/jeecg/modules/fbsAbnormalWorkingHours/mapper/xml/FbsAbnormalWorkingHoursDescribeMapper.xml

@@ -19,21 +19,26 @@
 
     <select id="getMonthExceptionByCategoryTwo" resultType="java.util.HashMap">
         SELECT
-        fawhd.product label,
-        sum( fawhd.rejects_number ) sum1,
-        fawhd.planned_quantity sum2
+        fawhd.materiel_name label,
+        sum( fawhd.materiel_bad_number ) sum1,
+        fawhd.materiel_number_of_tasks sum2
         FROM
         fbs_abnormal_working_hours_describe fawhd
         LEFT JOIN fbs_abnormal_working_hours fawh ON fawhd.abnormal_working_hours_id = fawh.id
         WHERE
         fawhd.del_flag = '0'
         AND fawhd.del_flag = '0'
-        AND fawhd.product IS NOT NULL
+        AND fawhd.materiel_name IS NOT NULL
+        AND fawhd.materiel_number_of_tasks >0
+        AND fawhd.materiel_bad_number >0
+       <!-- AND fawhd.product IS NOT NULL
         AND fawhd.type='物料'
         AND fawhd.planned_quantity >0
+        -->
         AND date_format( fawh.date, '%Y-%m' ) = DATE_FORMAT( now( ), '%Y-%m' )
         GROUP BY
-        fawhd.product,fawhd.planned_quantity
+        <!--fawhd.product,fawhd.planned_quantity-->
+        fawhd.materiel_name
     </select>
 
     <select id="getListAndMain" resultType="org.jeecg.modules.fbsAbnormalWorkingHours.entity.FbsAbnormalWorkingHoursDescribe">

src/main/java/org/jeecg/modules/fbsAbnormalWorkingHours/mapper/xml/FbsAbnormalWorkingHoursMapper.xml

@@ -36,8 +36,11 @@
         WHERE
             fawhd.del_flag = '0'
             AND fawhd.del_flag = '0'
+            AND fawhd.production_order_number_name IS NOT NULL
+            AND fawhd.rejects_number>0
+        <!--
             AND fawhd.product IS NOT NULL
-            AND fawhd.type='产品'
+            AND fawhd.type='产品'-->
             <if test="dateString=='%Y-%m-%d'">
                 AND date_format( fawh.date, #{dateString} ) = DATE_FORMAT(date_sub(curdate(),interval 1 day), #{dateString} )
             </if>
@@ -46,7 +49,8 @@
             </if>
 
         GROUP BY
-            fawhd.product,fawhd.planned_quantity
+           <!-- fawhd.product,fawhd.planned_quantity-->
+        fawhd.production_order_number_name
     </select>
 
     <select id="getRejectsNumberSameDay" resultType="org.jeecg.modules.fbsAbnormalWorkingHours.entity.FbsAbnormalWorkingHours">

src/main/java/org/jeecg/modules/fbsBasedate/entity/FbsTechnologicalProcessItem.java

@@ -3,6 +3,7 @@ package org.jeecg.modules.fbsBasedate.entity;
 import java.io.Serializable;
 import java.util.Date;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -70,4 +71,8 @@ public class FbsTechnologicalProcessItem implements Serializable {
 	/**主表id*/
 	@Excel(name = "主表id", width = 15)
 	private String fbsTechnologicalProcessId;
+
+	//是否完成到这个工艺(1是，2不是)
+	@TableField(exist = false)
+	private String isTechnological;
 }

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

@@ -15,6 +15,8 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.appInterface.service.IFbsWorkingStatisticsService;
+import org.jeecg.modules.fbsBasedate.entity.FbsTechnologicalProcessItem;
+import org.jeecg.modules.fbsBasedate.service.IFbsTechnologicalProcessItemService;
 import org.jeecg.modules.fbsInventory.entity.FbsInventory;
 import org.jeecg.modules.fbsInventory.service.IFbsInventoryService;
 import org.jeecg.modules.fbsMomOrder.entity.FbsMomOrder;
@@ -72,6 +74,9 @@ public class FbsWorkshopDispatchListController {
 	 @Autowired
 	 IFbsWorkingStatisticsService iFbsWorkingStatisticsService;
 
+	 @Autowired
+	 IFbsTechnologicalProcessItemService fbsTechnologicalProcessItemService;
+
 	/**
 	  * 分页列表查询
 	 * @param fbsWorkshopDispatchList
@@ -776,6 +781,8 @@ public class FbsWorkshopDispatchListController {
 		 try {
 			 //派工数据及完工信息
 			 List<FbsWorkshopDispatchList> fbsWorkshopDispatchListList=fbsWorkshopDispatchListService.getProductList();
+			 //获取工艺明细
+			 getFbsTechnologicalProcessItem(fbsWorkshopDispatchListList);
 			 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 			 if(fbsWorkshopDispatchListList!=null){
                  List<String> stringList=new ArrayList<>();//存储库存产品id(code)
@@ -814,6 +821,42 @@ public class FbsWorkshopDispatchListController {
 		 return result;
 	 }
 
+	 //获取工艺明细
+	 public void getFbsTechnologicalProcessItem(List<FbsWorkshopDispatchList> fbsWorkshopDispatchListList){
+	 	//获取工艺明细
+	 	QueryWrapper<FbsTechnologicalProcessItem> queryWrapper=new QueryWrapper<>();
+	 	queryWrapper.lambda().eq(FbsTechnologicalProcessItem::getDelFlag,"0");
+	 	queryWrapper.lambda().orderByAsc(FbsTechnologicalProcessItem::getSort);
+		List<FbsTechnologicalProcessItem> fbsTechnologicalProcessItemList= fbsTechnologicalProcessItemService.list(queryWrapper);
+	 	if(fbsWorkshopDispatchListList!=null&&fbsWorkshopDispatchListList.size()>0&&fbsTechnologicalProcessItemList!=null&&fbsTechnologicalProcessItemList.size()>0){
+			//派工
+	 		for(FbsWorkshopDispatchList fbsWorkshopDispatchList:fbsWorkshopDispatchListList){
+	 			//工艺主表id
+	 			String fbsTechnologicalProcessId=fbsWorkshopDispatchList.getFbsTechnologicalProcessId();
+	 			//工艺进度字符串
+				String fbsTechnologicalProcessItemName=fbsWorkshopDispatchList.getFbsTechnologicalProcessItemName();
+	 			//储存工艺明细
+				List<FbsTechnologicalProcessItem> fbsTechnologicalProcessItemListAdd=new ArrayList<>();
+				//明细
+				for(FbsTechnologicalProcessItem fbsTechnologicalProcessItem:fbsTechnologicalProcessItemList){
+					//根据派工的工艺主表id找到工艺明细
+					if(StringUtils.isNotBlank(fbsTechnologicalProcessId)){
+						if(fbsTechnologicalProcessId.equals(fbsTechnologicalProcessItem.getFbsTechnologicalProcessId())){
+							//拿到工艺明细名称和派工中保存的进度工艺字符模糊查询是否存在  存在则定义标识代表完成
+							if(fbsTechnologicalProcessItemName.indexOf(fbsTechnologicalProcessItem.getName())>=0){
+								fbsTechnologicalProcessItem.setIsTechnological("1");
+							}else{
+								fbsTechnologicalProcessItem.setIsTechnological("2");
+							}
+							fbsTechnologicalProcessItemListAdd.add(fbsTechnologicalProcessItem);
+						}
+					}
+				}
+				fbsWorkshopDispatchList.setFbsTechnologicalProcessItemList(fbsTechnologicalProcessItemListAdd);
+			}
+		}
+	 }
+
 	 /**
 	 * @Author chenchuang
 	 * @Description //TODO 产线看板：生产计划
@@ -833,7 +876,7 @@ public class FbsWorkshopDispatchListController {
 //		queryWrapper.lambda().orderByDesc(FbsWorkshopDispatchList::getDate);
 //		 List<FbsWorkshopDispatchList> fbsWorkshopDispatchListList=fbsWorkshopDispatchListService.list(queryWrapper);
 		List<FbsWorkshopDispatchList> fbsWorkshopDispatchListList=fbsWorkshopDispatchListService.getListWhereStartEnd();
-
+		getFbsTechnologicalProcessItem(fbsWorkshopDispatchListList);
 		 result.setResult(fbsWorkshopDispatchListList);
 		 result.success("操作成功");
 		 return result;

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

@@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.jeecg.modules.fbsBasedate.entity.FbsTechnologicalProcessItem;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
 
@@ -274,4 +275,8 @@ public class FbsWorkshopDispatchList implements Serializable {
 	//显示每天
 	@TableField(exist =false)
 	private List<String> dayList;
+
+	//工艺明细
+	@TableField(exist = false)
+	private List<FbsTechnologicalProcessItem> fbsTechnologicalProcessItemList;
 }

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

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