后台 看板问题修改

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

@@ -160,9 +160,9 @@ public class FbsWorkingStatisticsController {
 		 }
 		 //状态（0初始，1接单,2暂停，3完成）
 		 QueryWrapper<FbsWorkshopDispatchList> ypffscSaleorderBQueryWrapper = new QueryWrapper<>();
-		 ypffscSaleorderBQueryWrapper.eq("personnel_id_u8", entity.getPersonnelCode()).eq("del_flag", 0);
+		 ypffscSaleorderBQueryWrapper.like("personnel_id_u8", entity.getPersonnelCode()).eq("del_flag", 0);
 		 ypffscSaleorderBQueryWrapper.eq("production_order_number_name", entity.getOrderNumber());
-		 ypffscSaleorderBQueryWrapper.in("state", 0,2,3);
+//		 ypffscSaleorderBQueryWrapper.in("state", 0,1,2,3);
 		 List<FbsWorkshopDispatchList> list = fbsWorkshopDispatchListService.list(ypffscSaleorderBQueryWrapper);
 		 if(list.size() < 1){
 			 res.setCode("1");
@@ -174,15 +174,28 @@ public class FbsWorkingStatisticsController {
 //			 res.setMsg("该订单计划数量已经全部入库"+entity.getOrderNumber());
 //			 return new ResponseEntity<ResHttpStatus>(res, HttpStatus.OK);
 //		 }
+
+		 QueryWrapper<FbsWorkingStatistics> workingStatisticsQueryWrapper = new QueryWrapper<>();
+		 workingStatisticsQueryWrapper.eq("personnel_Code", entity.getPersonnelCode()).eq("del_flag", 0);
+		 workingStatisticsQueryWrapper.eq("order_number", entity.getOrderNumber());
+		 workingStatisticsQueryWrapper.eq("final_State", 1);
+		 List<FbsWorkingStatistics> list2 = fbsWorkingStatisticsService.list(workingStatisticsQueryWrapper);
+		 if(list2.size()>0){
+			 res.setCode("1");
+			 res.setMsg("该订单已开工，请勿再次操作"+entity.getOrderNumber());
+			 return new ResponseEntity<ResHttpStatus>(res, HttpStatus.OK);
+		 }
+
 		 FbsWorkshopDispatchList workshopDispatchList = list.get(0);
 		 //0初始，1接单,2暂停，3完成
-		 if(StringUtils.isNotBlank(workshopDispatchList.getState()) && !workshopDispatchList.getState().equals("0") &&
-                 !workshopDispatchList.getState().equals("2")&&
-				 !workshopDispatchList.getState().equals("3")){
-             res.setCode("1");
-             res.setMsg("该订单已开工，请勿再次操作"+entity.getOrderNumber());
-             return new ResponseEntity<ResHttpStatus>(res, HttpStatus.OK);
-         }
+//		 if(StringUtils.isNotBlank(workshopDispatchList.getState()) && !workshopDispatchList.getState().equals("0") &&
+//                 !workshopDispatchList.getState().equals("2")&&
+//				 !workshopDispatchList.getState().equals("3")){
+//             res.setCode("1");
+//             res.setMsg("该订单已开工，请勿再次操作"+entity.getOrderNumber());
+//             return new ResponseEntity<ResHttpStatus>(res, HttpStatus.OK);
+//         }
+
 		 entity.setStartDate(workshopDispatchList.getPlannedStartTime());//计划时间
 		 entity.setEndDate(workshopDispatchList.getPlannedEndTime());//计划时间
 		 entity.setMaterielCode(workshopDispatchList.getProductId());//物料编码
@@ -270,20 +283,22 @@ public class FbsWorkingStatisticsController {
 		 }
 		//状态（0初始，1接单,2暂停，3完成）
 		 QueryWrapper<FbsWorkshopDispatchList> ypffscSaleorderBQueryWrapper = new QueryWrapper<>();
-		 ypffscSaleorderBQueryWrapper.eq("personnel_id_u8", entity.getPersonnelCode()).eq("del_flag", 0);
+		 ypffscSaleorderBQueryWrapper.like("personnel_id_u8", entity.getPersonnelCode()).eq("del_flag", 0);
 		 ypffscSaleorderBQueryWrapper.eq("production_order_number_name", entity.getOrderNumber());
-		 ypffscSaleorderBQueryWrapper.eq("state", 1);
+//		 ypffscSaleorderBQueryWrapper.eq("state", 1);
 
 		 List<FbsWorkshopDispatchList> list = fbsWorkshopDispatchListService.list(ypffscSaleorderBQueryWrapper);
-		 if(list.size() < 1){
-			 res.setCode("1");
-			 res.setMsg("该订单还没有上岗"+entity.getOrderNumber());
-			 return new ResponseEntity<ResHttpStatus>(res, HttpStatus.OK);
-		 }
+//		 if(list.size() < 1){
+//			 res.setCode("1");
+//			 res.setMsg("该订单还没有上岗"+entity.getOrderNumber());
+//			 return new ResponseEntity<ResHttpStatus>(res, HttpStatus.OK);
+//		 }
+
+
 		 FbsWorkshopDispatchList workshopDispatchList = list.get(0);
 
          //状态（0初始，1接单,2暂停，3完成）
-         if(StringUtils.isNotBlank(workshopDispatchList.getState()) && !workshopDispatchList.getState().equals("1")){
+         if(StringUtils.isNotBlank(workshopDispatchList.getState()) && workshopDispatchList.getState().equals("3")){
              res.setCode("1");
              res.setMsg("该订单目前不在可暂停状态，无法暂停"+entity.getOrderNumber());
              return new ResponseEntity<ResHttpStatus>(res, HttpStatus.OK);
@@ -440,11 +455,11 @@ public class FbsWorkingStatisticsController {
 			 return new ResponseEntity<ResHttpStatus>(res, HttpStatus.OK);
 		 }
 		 //状态（0初始，1接单,2暂停，3完成）
-		 if(workshopDispatchList.getState().equals("0") || workshopDispatchList.getState().equals("2")){
-			 res.setCode("1");
-			 res.setMsg("该订单目前正在进行中，无法报工"+entity.getOrderNumber());
-			 return new ResponseEntity<ResHttpStatus>(res, HttpStatus.OK);
-		 }
+//		 if(workshopDispatchList.getState().equals("0") || workshopDispatchList.getState().equals("2")){
+//			 res.setCode("1");
+//			 res.setMsg("该订单目前正在进行中，无法报工"+entity.getOrderNumber());
+//			 return new ResponseEntity<ResHttpStatus>(res, HttpStatus.OK);
+//		 }
 
 		 entity.setStartDate(workshopDispatchList.getPlannedStartTime());//计划时间
 		 entity.setEndDate(workshopDispatchList.getPlannedStartTime());//计划时间
@@ -690,7 +705,7 @@ public class FbsWorkingStatisticsController {
 
 		 QueryWrapper<FbsWorkshopDispatchList> queryWrapper = new QueryWrapper<>();
 		 queryWrapper.eq("production_order_number_name", sheetId).eq("del_flag", 0);
-		 queryWrapper.eq("personnel_id_u8", userId);
+		 queryWrapper.like("personnel_id_u8", userId);
 		 List<FbsWorkshopDispatchList> list = fbsWorkshopDispatchListService.list(queryWrapper);
 		 if(list.size() < 1){
 			 res.setCode("1");

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

@@ -448,6 +448,9 @@ public class FbsWorkshopDispatchListController {
 		 Result<List<FbsWorkshopDispatchList>> result=new Result<>();
 		 try {
 			 FbsMomOrderdetail fbsMomOrderdetail=new FbsMomOrderdetail();
+			 if(StringUtils.isNotBlank(fbsWorkshopDispatchList.getProductionOrderNumberName())&&fbsWorkshopDispatchList.getProductionOrderNumberName().equals("null")){
+				 fbsWorkshopDispatchList.setProductionOrderNumberName(null);
+			 }
 			 fbsMomOrderdetail.setMocode(fbsWorkshopDispatchList.getProductionOrderNumberName());
 			 List<FbsMomOrderdetail> fbsMomOrderdetailList= iFbsMomOrderdetailService.getMonthListStatre(fbsMomOrderdetail);
 			 List<FbsWorkshopDispatchList> fbsWorkshopDispatchListList=fbsWorkshopDispatchListService.getSumDispatch(fbsMomOrderdetailList);