11111

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

@@ -135,6 +135,11 @@ public class FbsWorkingStatisticsController {
 			 res.setMsg("派工单id不能为空");
 			 return new ResponseEntity<ResHttpStatus>(res, HttpStatus.OK);
 		 }
+		if(StringUtils.isBlank(entity.getRowNumber())){
+			 res.setCode("1");
+			 res.setMsg("行号能为空");
+			 return new ResponseEntity<ResHttpStatus>(res, HttpStatus.OK);
+		 }
 
 		 QueryWrapper<FbsWorkshopDispatchList> ypffscSaleorderBQueryWrapper = new QueryWrapper<>();
 		 ypffscSaleorderBQueryWrapper.eq("id", entity.getPkWorkshopDispatchList()).eq("del_flag", 0);
@@ -444,11 +449,26 @@ public class FbsWorkingStatisticsController {
 			 return new ResponseEntity<ResHttpStatus>(res, HttpStatus.OK);
 		 }
 
-//		 fbsWorkingStatisticsService.getById();
+		 QueryWrapper<FbsWorkingStatistics> queryWrapper = new QueryWrapper<>();
+		 queryWrapper.eq("personnel_Code", sheetId).eq("del_flag", 0);
+		 List<FbsWorkingStatistics> list = fbsWorkingStatisticsService.list(queryWrapper);
+		 if(list.size() < 1){
+			 res.setCode("1");
+			 res.setMsg("人员编码不正确"+sheetId);
+			 return new ResponseEntity<ResHttpStatus>(res, HttpStatus.OK);
+		 }
+		 FbsWorkingStatistics entity = list.get(0);
+		 Map<String,Object> map = new HashMap<>();
+		 map.put("orderCode",entity.getOrderNumber());
+		 map.put("rowNumber",entity.getRowNumber());
+		 map.put("materialCode",entity.getMaterielCode());
+		 map.put("materialName",entity.getMaterielName());
+		 map.put("startDate",entity.getStartDate());
+		 map.put("endDate",entity.getEndDate());
 
 		 res.setCode("0");
 		 res.setMsg("成功");
-//		 res.setData(map);
+		 res.setData(map);
 
 		 return new ResponseEntity<ResHttpStatus>(res, HttpStatus.OK);
 

src/main/java/org/jeecg/modules/appInterface/entity/FbsWorkingStatistics.java

@@ -106,6 +106,8 @@ public class FbsWorkingStatistics implements Serializable {
 	/**0保存，1提交 */
 	@Excel(name = "0保存，1提交", width = 15)
 	private String state;
+	//物料行号
+	private String rowNumber;
 
 	//产品名称
 	@TableField(exist = false)