派工单 异常信息

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

@@ -247,7 +247,7 @@ public class FbsWorkingStatisticsController {
 		 }else {
 		 	//是否有同个流程  没有则累加到后面
 		 	if(list.get(0).getFbsTechnologicalProcessItemName().indexOf(entity.getFbsTechnologicalProcessItemName())==-1){
-				fbsWorkshopDispatchList.setFbsTechnologicalProcessItemName(list.get(0).getFbsTechnologicalProcessItemName()+"=>"+entity.getFbsTechnologicalProcessItemName());
+				fbsWorkshopDispatchList.setFbsTechnologicalProcessItemName(list.get(0).getFbsTechnologicalProcessItemName()+"➜"+entity.getFbsTechnologicalProcessItemName());
 			}
 		 }
 		 //添加异常子表信息
@@ -355,7 +355,17 @@ public class FbsWorkingStatisticsController {
 		 entity.setEndDate(workshopDispatchList.getPlannedStartTime());//计划时间
 		 entity.setFinalTime(entity.getCutTime());//获取当前时间
 		 entity.setFinalInfo("下岗/暂停");
-		 entity.setFinalState("2");//完结状态（1-开工，2-下岗/暂停，3-实时报工）
+		 ///////////遇到多人的订单判断是否只有一个属于上岗的情况
+		 QueryWrapper<FbsWorkingStatistics> fbsWorkingStatisticsQueryWrapper=new QueryWrapper<>();
+		 fbsWorkingStatisticsQueryWrapper.lambda().eq(FbsWorkingStatistics::getDelFlag,"0");
+		 fbsWorkingStatisticsQueryWrapper.lambda().eq(FbsWorkingStatistics::getPkWorkshopDispatchList,workshopDispatchList.getId());
+		 fbsWorkingStatisticsQueryWrapper.lambda().eq(FbsWorkingStatistics::getFinalState,"1");
+		 List<FbsWorkingStatistics> fbsWorkingStatisticsList=fbsWorkingStatisticsService.list(fbsWorkingStatisticsQueryWrapper);
+		 //只有一个则订单下岗 如果存在多个则状态不变
+		 if(fbsWorkingStatisticsList!=null&&fbsWorkingStatisticsList.size()==1){
+			 entity.setFinalState("2");//完结状态（1-开工，2-下岗/暂停，3-实时报工）
+		 }
+
 		 entity.setPkWorkshopDispatchList(list.get(0).getId());
 		 entity.setId(list2.get(0).getId());
 		 fbsWorkingStatisticsService.updateById(entity);
@@ -1018,8 +1028,8 @@ public class FbsWorkingStatisticsController {
 	 public Result<List<Map<String,Object>>> getEsopFileList(String code,String moCode){
 		 Result<List<Map<String,Object>>> result=new Result<>();
 	 	 ArrayList<String> list = new ArrayList<>();
-//		 String par = FileList.getAllFileName(upLoadPath+code,list);
-		 String par = FileList.getAllFileName(upLoadPath,list);
+		 String par = FileList.getAllFileName(upLoadPath+code,list);
+//		 String par = FileList.getAllFileName(upLoadPath,list);
 
 		 if(par.equals("false")){
 			 result.error500("文件为空");
@@ -1028,37 +1038,44 @@ public class FbsWorkingStatisticsController {
 
 		 List<Map<String,Object>> resuleMap = new ArrayList<>();
 		 try {
-			//获取图纸号
-			 List<String> drawingCodeList=new ArrayList<>();
-			 //母件图纸
-			 FbsInventory fbsInventory=iFbsInventoryService.getInventory(code);
-			 if(fbsInventory!=null){
-				 drawingCodeList.add(fbsInventory.getCinvdefine6());
-			 }
-			 //子件图纸号
-			 List<FbsInventory> fbsInventoryList=iFbsInventoryService.getDrawingCode(moCode);
-			 if(fbsInventoryList!=null){
-				 for(FbsInventory fbsInventory1:fbsInventoryList){
-					 drawingCodeList.add(fbsInventory1.getCinvdefine6());
-				 }
-			 }
-			 //生产订单中包括的图纸号
-			 for(String drawingCode:drawingCodeList){
-			 	//文件夹中的图纸号
-				 for (String o:list){
-				 	//是否找到图纸号
-					if(drawingCode!=null&&o.indexOf(drawingCode)>=0){
-						 Map<String,Object> map = new HashMap<>();
-						 map.put("fileName",o);
-						 map.put("fileType",getFileOf(o).toLowerCase());
-						 resuleMap.add(map);
-					}
-				 }
+//			//获取图纸号
+//			 List<String> drawingCodeList=new ArrayList<>();
+//			 //母件图纸
+//			 FbsInventory fbsInventory=iFbsInventoryService.getInventory(code);
+//			 if(fbsInventory!=null){
+//				 drawingCodeList.add(fbsInventory.getCinvdefine6());
+//			 }
+//			 //子件图纸号
+//			 List<FbsInventory> fbsInventoryList=iFbsInventoryService.getDrawingCode(moCode);
+//			 if(fbsInventoryList!=null){
+//				 for(FbsInventory fbsInventory1:fbsInventoryList){
+//					 drawingCodeList.add(fbsInventory1.getCinvdefine6());
+//				 }
+//			 }
+//			 //生产订单中包括的图纸号
+//			 for(String drawingCode:drawingCodeList){
+//			 	//文件夹中的图纸号
+//				 for (String o:list){
+//				 	//是否找到图纸号
+//					if(drawingCode!=null&&o.indexOf(drawingCode)>=0){
+//						 Map<String,Object> map = new HashMap<>();
+//						 map.put("fileName",o);
+//						 map.put("fileType",getFileOf(o).toLowerCase());
+//						 resuleMap.add(map);
+//					}
+//				 }
+//			 }
+//		 	if(resuleMap.size()<=0){
+//				result.error500("文件为空");
+//				return result;
+//			}
+			 for (String o:list){
+				 //是否找到图纸号
+					 Map<String,Object> map = new HashMap<>();
+					 map.put("fileName",o);
+					 map.put("fileType",getFileOf(o).toLowerCase());
+					 resuleMap.add(map);
 			 }
-		 	if(resuleMap.size()<=0){
-				result.error500("文件为空");
-				return result;
-			}
 			result.setResult(resuleMap);
 			result.success("操作成功");
 

src/main/java/org/jeecg/modules/appInterface/mapper/xml/FbsWorkingStatisticsMapper.xml

@@ -83,7 +83,8 @@
         ) as '异常',
         (
         SELECT
-        IFNULL(sum( work_order_batching ),0) + IFNULL(sum( storage_finished_products ),0) + IFNULL(sum( storage_raw_materials ),0) + IFNULL(sum( research_and_development ),0)+ IFNULL(sum( project_ingredients ),0)+ IFNULL(sum( project_delivery ),0)+ IFNULL(sum( pack_project ),0)+ IFNULL(sum( loading ),0)+ IFNULL(sum( inventory ),0)
+        IFNULL(sum( work_order_batching ),0) + IFNULL(sum( storage_finished_products ),0) + IFNULL(sum( storage_raw_materials ),0) + IFNULL(sum( research_and_development ),0)+ IFNULL(sum( project_ingredients ),0)+ IFNULL(sum( project_delivery ),0)+ IFNULL(sum( pack_project ),0)+ IFNULL(sum( loading ),0)
+        + IFNULL(sum( inventory ),0)+ IFNULL(sum( accessories ),0)+ IFNULL(sum( defray ),0)
         FROM
         fbs_warehouse
         WHERE

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

@@ -139,7 +139,8 @@
             sum( overtime_hours ) AS overtime_hours,
             IFNULL( sum( train ), 0 ) + IFNULL( sum( meeting ), 0 ) + IFNULL( sum( five_s ), 0 ) + IFNULL( sum( other ), 0 ) AS other,
             0 AS quality,
-            IFNULL( sum( work_order_batching ), 0 ) + IFNULL( sum( storage_finished_products ), 0 ) + IFNULL( sum( storage_raw_materials ), 0 ) + IFNULL( sum( research_and_development ), 0 ) + IFNULL( sum( project_ingredients ), 0 ) + IFNULL( sum( research_and_development ), 0 ) + IFNULL( sum( project_delivery ), 0 ) + IFNULL( sum( loading ), 0 ) + IFNULL( sum( inventory ), 0 ) AS plan
+            IFNULL( sum( work_order_batching ), 0 ) + IFNULL( sum( storage_finished_products ), 0 ) + IFNULL( sum( storage_raw_materials ), 0 ) + IFNULL( sum( research_and_development ), 0 ) + IFNULL( sum( project_ingredients ), 0 ) + IFNULL( sum( project_delivery ), 0 ) + IFNULL( sum( pack_project ), 0 ) + IFNULL( sum( loading ), 0 )
+            + IFNULL( sum( inventory ), 0 )+ IFNULL( sum( accessories ), 0 )+ IFNULL( sum( defray ), 0 ) AS plan
         FROM
             fbs_warehouse
         WHERE

src/main/java/org/jeecg/modules/fbsMomOrder/controller/FbsMomOrderController.java

@@ -73,32 +73,33 @@ public class FbsMomOrderController {
 
 			List<Map<String,Object>> map = iFbsWorkshopDispatchListService.getEsopList();
 			ArrayList<String> list = new ArrayList<>();
-			String par = FileList.getAllFileName(upLoadPath,list);
+//			String par = FileList.getAllFileName(upLoadPath,list);
 			for(Map<String,Object> mapEn:map){
-				//获取图纸号
-				List<String> drawingCodeList=new ArrayList<>();
-				//母件图纸
-				FbsInventory fbsInventory=iFbsInventoryService.getInventory(mapEn.get("materialCode").toString());
-				if(fbsInventory!=null){
-					drawingCodeList.add(fbsInventory.getCinvdefine6());
-				}
-				//子件图纸号
-				List<FbsInventory> fbsInventoryList=iFbsInventoryService.getDrawingCode(mapEn.get("orderSheetCode").toString());
-				if(fbsInventoryList!=null){
-					for(FbsInventory fbsInventory1:fbsInventoryList){
-						drawingCodeList.add(fbsInventory1.getCinvdefine6());
-					}
-				}
-				boolean isQuery=false;
-				for(String drawingCode:drawingCodeList){
-					for (String o:list){
-						//是否找到图纸号
-						if(drawingCode!=null&&o.indexOf(drawingCode)>=0){
-							isQuery=true;
-						}
-					}
-				}
-				if(isQuery==false){//没有文件
+//				//获取图纸号
+//				List<String> drawingCodeList=new ArrayList<>();
+//				//母件图纸
+//				FbsInventory fbsInventory=iFbsInventoryService.getInventory(mapEn.get("materialCode").toString());
+//				if(fbsInventory!=null){
+//					drawingCodeList.add(fbsInventory.getCinvdefine6());
+//				}
+//				//子件图纸号
+//				List<FbsInventory> fbsInventoryList=iFbsInventoryService.getDrawingCode(mapEn.get("orderSheetCode").toString());
+//				if(fbsInventoryList!=null){
+//					for(FbsInventory fbsInventory1:fbsInventoryList){
+//						drawingCodeList.add(fbsInventory1.getCinvdefine6());
+//					}
+//				}
+//				boolean isQuery=false;
+//				for(String drawingCode:drawingCodeList){
+//					for (String o:list){
+//						//是否找到图纸号
+//						if(drawingCode!=null&&o.indexOf(drawingCode)>=0){
+//							isQuery=true;
+//						}
+//					}
+//				}
+				String par = FileList.getAllFileName(upLoadPath+mapEn.get("materialCode"),list);
+				if(par.equals("false")){//没有文件
 					mapEn.put("color","darkgray");
 				}else{//有文件
 					mapEn.put("color","goldenrod");

src/main/java/org/jeecg/modules/fbsMomOrder/mapper/xml/FbsMomOrderdetailMapper.xml

@@ -73,6 +73,7 @@
             mm.StartDate,
             getdate()) =0-->
             substring( m.MoCode, 3, 4 ) = substring( CONVERT ( VARCHAR ( 100 ), GETDATE ( ), 112 ), 3, 4 )
+            and mo.Status in ('3','4')
         ORDER BY
             m.createtime DESC
     </select>

src/main/java/org/jeecg/modules/fbsWarehouse/entity/FbsWarehouse.java

@@ -81,14 +81,14 @@ public class FbsWarehouse implements Serializable {
 	/**研发领用-出库单号*/
 	@Excel(name = "研发领用-出库单号", width = 15)
 	private java.lang.String developmentDeliveryOrderNo;
-	/**项目配料*/
-	@Excel(name = "项目配料", width = 15)
+	/**项目配料(补发发货)*/
+	@Excel(name = "项目配料(补发发货)", width = 15)
 	private java.lang.Double projectIngredients;
 	/**项目配料-出库单号*/
 	@Excel(name = "项目配料-出库单号", width = 15)
 	private java.lang.String projectDeliveryOrderNo;
-	/**项目发货*/
-	@Excel(name = "项目发货", width = 15)
+	/**项目发货（售后发货）*/
+	@Excel(name = "项目发货（售后发货）", width = 15)
 	private java.lang.Double projectDelivery;
 	/**项目发货-项目名称*/
 	@Excel(name = "项目发货-项目名称", width = 15)
@@ -172,6 +172,18 @@ public class FbsWarehouse implements Serializable {
 	/**自定义字段5*/
 	@Excel(name = "自定义字段5", width = 15)
 	private String def5;
+	/**配辅料*/
+	@Excel(name = "配辅料", width = 15)
+	private java.lang.Double accessories;
+	/**配辅料-出库单号*/
+	@Excel(name = "配辅料-出库单号", width = 15)
+	private java.lang.String accessoriesDeliveryOrderNo;
+	/**支给*/
+	@Excel(name = "支给", width = 15)
+	private java.lang.Double defray;
+	/**支给-备注*/
+	@Excel(name = "支给-备注", width = 15)
+	private java.lang.String defrayMemo;
 	//开始时间
 	@TableField(exist = false)
 	private String start;

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

@@ -122,6 +122,11 @@ public class FbsWorkshopDispatchListController {
 		if(StringUtils.isNotBlank(product)){
 			fbsWorkshopDispatchList.setProduct(null);
 		}
+		//物料编码
+		String productId=fbsWorkshopDispatchList.getProductId();
+		if(StringUtils.isNotBlank(productId)){
+			fbsWorkshopDispatchList.setProductId(null);
+		}
 		//项目名称
         String projectName=fbsWorkshopDispatchList.getProjectName();
 		if(StringUtils.isNotBlank(projectName)){
@@ -144,10 +149,14 @@ public class FbsWorkshopDispatchListController {
 		if(StringUtils.isNotBlank(product)){
 			queryWrapper.lambda().like(FbsWorkshopDispatchList::getProduct,product);
 		}
+		if(StringUtils.isNotBlank(productId)){
+			queryWrapper.lambda().like(FbsWorkshopDispatchList::getProductId,productId);
+		}
 		if(StringUtils.isNotBlank(projectName)){
 		    queryWrapper.lambda().like(FbsWorkshopDispatchList::getProjectName,projectName);
         }
 
+
 		if(stateString!=null){
 			queryWrapper.apply("(1=1 ");
 			int i=0;

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

@@ -274,7 +274,7 @@ public class FbsWorkshopDispatchList implements Serializable {
 	private List<String> isColor;
 	//显示每天
 	@TableField(exist =false)
-	private List<String> dayList;
+	private List<Map<String,Object>> dayList;
 
 	//工艺明细
 	@TableField(exist = false)

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

@@ -128,10 +128,10 @@
         SELECT
             IFNULL(sum( quality ),0) AS '质量',
             IFNULL(sum( design ),0) AS '设计',
-            IFNULL(sum( rework ),0) AS '返工',
+            <!--IFNULL(sum( rework ),0) AS '返工',-->
             IFNULL(sum( materiel ),0) AS '物料',
             IFNULL(sum( energy ),0) AS '能源',
-            IFNULL(sum( other ),0) AS '其他',
+            <!--IFNULL(sum( other ),0) AS '其他',-->
             IFNULL(sum( equipment ),0) AS '设备',
             IFNULL(sum( plan ),0) AS '计划'
         FROM

src/main/java/org/jeecg/modules/fbsWorkshopDispatchList/service/impl/FbsWorkshopDispatchListServiceImpl.java

@@ -213,8 +213,8 @@ public class FbsWorkshopDispatchListServiceImpl extends ServiceImpl<FbsWorkshopD
 //                    quantityCompletedTotal=getDecimalNew(dispatchListSum.getQuantityCompletedTotal()+"");
 //                }
                 if(numberOfTasksTotal.doubleValue()>0.0){
-                    dispatchListSum.setAchievementRate(getDecimalNew(quantityCompletedTotal+"").divide(numberOfTasksTotal,2,BigDecimal.ROUND_HALF_UP).multiply(getDecimalNew("100.0")).doubleValue()+"");
-                }
+                    dispatchListSum.setAchievementRate(formatDouble0(getDecimalNew(quantityCompletedTotal+"").divide(numberOfTasksTotal,0,BigDecimal.ROUND_HALF_UP).multiply(getDecimalNew("100.0")).doubleValue()));
+                    }
                 //生产效率
                 //完成标准工时
                 BigDecimal standardWorkingHoursActualTotal=new BigDecimal("0.0");
@@ -222,7 +222,7 @@ public class FbsWorkshopDispatchListServiceImpl extends ServiceImpl<FbsWorkshopD
                     standardWorkingHoursActualTotal=getDecimalNew(dispatchListSum.getStandardWorkingHoursActualTotal());
                 }
                 if(manHoursCompletedTotal.doubleValue()>0.0){
-                    dispatchListSum.setProductionEfficiency(standardWorkingHoursActualTotal.divide(manHoursCompletedTotal,2,BigDecimal.ROUND_HALF_UP).multiply(getDecimalNew("100.0")).doubleValue()+"");
+                    dispatchListSum.setProductionEfficiency(formatDouble0(standardWorkingHoursActualTotal.divide(manHoursCompletedTotal,0,BigDecimal.ROUND_HALF_UP).multiply(getDecimalNew("100.0")).doubleValue()));
                 }
 
 
@@ -534,6 +534,9 @@ public class FbsWorkshopDispatchListServiceImpl extends ServiceImpl<FbsWorkshopD
     public static String formatDouble5(double d) {
         return String.format("%.1f", d);
     }
+    public static String formatDouble0(double d) {
+        return String.format("%.0f", d);
+    }
 
     @Override
     public Map<String,Object> getProductHoursMonthReport(String dateString) {
@@ -716,10 +719,22 @@ public class FbsWorkshopDispatchListServiceImpl extends ServiceImpl<FbsWorkshopD
         String endTime = lastday;
         List<Date> dateList=startDateAndEndDate(startTime,endTime);
         //获取所有的日
-        List<String> dayList=new ArrayList<>();
+        List<Map<String,Object>> dayList=new ArrayList<>();
+        Calendar cal = Calendar.getInstance();
+
         for(Date date:dateList){
+            Map<String,Object> map=new HashMap<>();
             String day=String .format("%td", date);
-            dayList.add(day);
+            map.put("day",day);
+            cal.setTime(date);
+            if (cal.get(Calendar.DAY_OF_WEEK)==Calendar.SATURDAY||cal.get(Calendar.DAY_OF_WEEK)==Calendar.SUNDAY)
+            {
+                map.put("week","1");
+            }else
+            {
+                map.put("week","2");
+             }
+            dayList.add(map);
         }
         fbsWorkshopDispatchList.setDayList(dayList);
         String year=String.format("%tY", dateList.get(0));