11111

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

@@ -132,7 +132,7 @@ public class FbsWorkingStatisticsController {
 		 }
 		 if(StringUtils.isBlank(entity.getOrderNumber())){
 			 res.setCode("1");
-			 res.setMsg("派工单id不能为空");
+			 res.setMsg("订单号不能为空");
 			 return new ResponseEntity<ResHttpStatus>(res, HttpStatus.OK);
 		 }
 		if(StringUtils.isBlank(entity.getRowNumber())){
@@ -142,7 +142,9 @@ public class FbsWorkingStatisticsController {
 		 }
 
 		 QueryWrapper<FbsWorkshopDispatchList> ypffscSaleorderBQueryWrapper = new QueryWrapper<>();
-		 ypffscSaleorderBQueryWrapper.eq("id", entity.getPkWorkshopDispatchList()).eq("del_flag", 0);
+		 ypffscSaleorderBQueryWrapper.eq("personnel_id_u8", entity.getPersonnelCode()).eq("del_flag", 0);
+		 ypffscSaleorderBQueryWrapper.eq("production_order_number_id", entity.getOrderNumber());
+		 ypffscSaleorderBQueryWrapper.in("state", 0,2);
 		 List<FbsWorkshopDispatchList> list = fbsWorkshopDispatchListService.list(ypffscSaleorderBQueryWrapper);
 		 if(list.size() < 1){
 			 res.setCode("1");
@@ -152,7 +154,7 @@ public class FbsWorkingStatisticsController {
 		 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")){
+                 !workshopDispatchList.getState().equals("2")){
              res.setCode("1");
              res.setMsg("该订单已开工，请勿再次操作"+entity.getOrderNumber());
              return new ResponseEntity<ResHttpStatus>(res, HttpStatus.OK);
@@ -163,9 +165,10 @@ public class FbsWorkingStatisticsController {
 		 entity.setFirstTime(new Date());//获取当前时间
 		 entity.setFinalInfo("开工");
 		 entity.setFinalState("1");//完结状态（1-开工，2-下岗/暂停，3-实时报工）
+		 entity.setPkWorkshopDispatchList(list.get(0).getId());
 
 		 fbsWorkingStatisticsService.save(entity);
-         fbsWorkshopDispatchListService.updateState("1",entity.getPkWorkshopDispatchList());
+         fbsWorkshopDispatchListService.updateState("1",list.get(0).getId());
 
 		 res.setCode("0");
 		 res.setMsg("成功");
@@ -223,22 +226,21 @@ public class FbsWorkingStatisticsController {
 			 res.setMsg("人员名称不能为空");
 			 return new ResponseEntity<ResHttpStatus>(res, HttpStatus.OK);
 		 }
-		 if(StringUtils.isBlank(entity.getPkWorkshopDispatchList())){
+		 if(StringUtils.isBlank(entity.getOrderNumber())){
 			 res.setCode("1");
-			 res.setMsg("派工单id不能为空");
+			 res.setMsg("订单号不能为空");
 			 return new ResponseEntity<ResHttpStatus>(res, HttpStatus.OK);
 		 }
-//         if(StringUtils.isBlank(entity.getOrderId())){
-//             res.setCode("1");
-//             res.setMsg("订单id不能为空");
-//             return new ResponseEntity<ResHttpStatus>(res, HttpStatus.OK);
-//         }
+		//状态（0初始，1接单,2暂停，3完成）
 		 QueryWrapper<FbsWorkshopDispatchList> ypffscSaleorderBQueryWrapper = new QueryWrapper<>();
-		 ypffscSaleorderBQueryWrapper.eq("id", entity.getPkWorkshopDispatchList()).eq("del_flag", 0);
+		 ypffscSaleorderBQueryWrapper.eq("personnel_id_u8", entity.getPersonnelCode()).eq("del_flag", 0);
+		 ypffscSaleorderBQueryWrapper.eq("production_order_number_id", entity.getOrderNumber());
+		 ypffscSaleorderBQueryWrapper.eq("state", 1);
+
 		 List<FbsWorkshopDispatchList> list = fbsWorkshopDispatchListService.list(ypffscSaleorderBQueryWrapper);
 		 if(list.size() < 1){
 			 res.setCode("1");
-			 res.setMsg("该订单还没有派工"+entity.getOrderNumber());
+			 res.setMsg("该订单还没有上岗"+entity.getOrderNumber());
 			 return new ResponseEntity<ResHttpStatus>(res, HttpStatus.OK);
 		 }
 		 FbsWorkshopDispatchList workshopDispatchList = list.get(0);
@@ -254,6 +256,7 @@ public class FbsWorkingStatisticsController {
 		 entity.setFinalTime(new Date());//获取当前时间
 		 entity.setFinalInfo("下岗/暂停");
 		 entity.setFinalState("2");//完结状态（1-开工，2-下岗/暂停，3-实时报工）
+		 entity.setPkWorkshopDispatchList(list.get(0).getId());
 		 fbsWorkingStatisticsService.updateById(entity);
          fbsWorkshopDispatchListService.updateState("2",entity.getPkWorkshopDispatchList());
 
@@ -360,22 +363,22 @@ public class FbsWorkingStatisticsController {
 			 res.setMsg("状态不能为空0保存，1提交");
 			 return new ResponseEntity<ResHttpStatus>(res, HttpStatus.OK);
 		 }
-		 if(StringUtils.isBlank(entity.getPkWorkshopDispatchList())){
+		 if(StringUtils.isBlank(entity.getOrderNumber())){
 			 res.setCode("1");
-			 res.setMsg("派工单id不能为空");
+			 res.setMsg("订单号不能为空");
 			 return new ResponseEntity<ResHttpStatus>(res, HttpStatus.OK);
 		 }
-//         if(StringUtils.isBlank(entity.getOrderId())){
-//             res.setCode("1");
-//             res.setMsg("订单id不能为空");
-//             return new ResponseEntity<ResHttpStatus>(res, HttpStatus.OK);
-//         }
+
 		 QueryWrapper<FbsWorkshopDispatchList> ypffscSaleorderBQueryWrapper = new QueryWrapper<>();
-		 ypffscSaleorderBQueryWrapper.eq("id", entity.getPkWorkshopDispatchList()).eq("del_flag", 0);
+		 //状态（0初始，1接单,2暂停，3完成）
+		 ypffscSaleorderBQueryWrapper.eq("personnel_id_u8", entity.getPersonnelCode()).eq("del_flag", 0);
+		 ypffscSaleorderBQueryWrapper.eq("production_order_number_id", entity.getOrderNumber());
+		 ypffscSaleorderBQueryWrapper.eq("state", 1);
+
 		 List<FbsWorkshopDispatchList> list = fbsWorkshopDispatchListService.list(ypffscSaleorderBQueryWrapper);
 		 if(list.size() < 1){
 			 res.setCode("1");
-			 res.setMsg("该订单还没有派工"+entity.getOrderNumber());
+			 res.setMsg("该订单还没有上岗"+entity.getOrderNumber());
 			 return new ResponseEntity<ResHttpStatus>(res, HttpStatus.OK);
 		 }
 		 FbsWorkshopDispatchList workshopDispatchList = list.get(0);
@@ -391,6 +394,7 @@ public class FbsWorkingStatisticsController {
 		 entity.setEndDate(workshopDispatchList.getPlannedStartTime());//计划时间
 
 		 entity.setFinalInfo("实时报工");
+		 entity.setPkWorkshopDispatchList(list.get(0).getId());
 		 entity.setFinalState("3");//完结状态（1-开工，2-下岗/暂停，3-实时报工）
 		 fbsWorkingStatisticsService.updateById(entity);
          fbsWorkshopDispatchListService.updateState("3",entity.getPkWorkshopDispatchList());