入库

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

@@ -15,6 +15,7 @@ import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.apache.commons.lang.StringUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
@@ -29,6 +30,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
 import org.jeecg.modules.appInterface.service.IFbsWorkingStatisticsService;
+import org.jeecg.modules.fbsBasedate.entity.FbsPersonnel;
+import org.jeecg.modules.fbsBasedate.service.IFbsPersonnelService;
 import org.jeecg.modules.fbsPerson.entity.FbsPerson;
 import org.jeecg.modules.fbsPerson.service.IFbsPersonService;
 import org.jeecg.modules.fbsWorkshopDispatchList.entity.FbsWorkshopDispatchList;
@@ -66,6 +69,8 @@ public class FbsWorkingStatisticsController {
 	 private IFbsWorkshopDispatchListService fbsWorkshopDispatchListService;
 	 @Autowired
 	 private IFbsPersonService fbsPersonService;
+	 @Autowired
+	 private IFbsPersonnelService iFbsPersonnelService;
 	 @Value("${jeecg.path.upload}")
 	 private String upLoadPath;
 	 @Value("${jeecg.path.upvedioAAA}")
@@ -457,12 +462,27 @@ public class FbsWorkingStatisticsController {
 	 }
 
 
-	 public void saveU8(FbsWorkingStatistics entity,FbsWorkshopDispatchList workshopDispatchList){
-	 	Map<String,Object> map=new HashMap<>();
-		map.put("CVOUCHCODE",entity.getOrderNumber());//单号
+	 public void saveU8(FbsWorkingStatistics entity,FbsWorkshopDispatchList workshopDispatchList,BigDecimal allHors){
+		 //明细
+		 List<Map<String,Object>> mapList=new ArrayList<>();
+		 Map<String,Object> itemMap=new LinkedHashMap<>();
+		 itemMap.put("CINVCODE",entity.getMaterielCode());//成品存货编码
+		 itemMap.put("IQUANTITY",entity.getQualifiedNumber());//数量
+		 itemMap.put("MOCODE",workshopDispatchList.getProductionOrderNumberName());//订单号
+		 itemMap.put("MOROWMO",entity.getRowNumber());//行号
+		 itemMap.put("CBATCH",entity.getBatchCode());
+		 mapList.add(itemMap);
+	 	//表头
+	 	Map<String,Object> map=new LinkedHashMap<>();
+		map.put("CVOUCHCODE",UUID.randomUUID());//单号
 		 Date date=new Date();
 		 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 		 map.put("DDATE",sdf.format(date));//入库日期
+		 map.put("CWHCODE","01");//仓库编码
+		 map.put("CDEPCODE","07");//部门编码
+		 map.put("CMAKER",entity.getPersonnelName());//制单人
+		 map.put("CRDCODE","103");//入库类型编码
+		 map.put("DETAILList",mapList);
 
 
 	 }
@@ -472,6 +492,7 @@ public class FbsWorkingStatisticsController {
 	  * @param userId
 	  * @return
 	  */
+
 	 @RequestMapping(value = "getPersonByCode")
 	 @ResponseBody
 	 public ResponseEntity<ResHttpStatus> getPersonByCode(String userId){
@@ -482,16 +503,33 @@ public class FbsWorkingStatisticsController {
 			 res.setMsg("人员编码不能为空-userId");
 			 return new ResponseEntity<ResHttpStatus>(res, HttpStatus.OK);
 		 }
-		 List<FbsPerson> entity = fbsPersonService.getPerByCode(userId);
-		 if(entity.size() < 1){
+//		 List<FbsPerson> entity = fbsPersonService.getPerByCode(userId);
+//
+//		 if(entity.size() < 1){
+//			 res.setCode("1");
+//			 res.setMsg("人员编码不正确"+userId);
+//			 return new ResponseEntity<ResHttpStatus>(res, HttpStatus.OK);
+//		 }
+//
+//		 Map<String,String> map = new HashMap<>();
+//		 map.put("userCode",entity.get(0).getCpersoncode());
+//		 map.put("realName",entity.get(0).getCpersonname());
+
+
+		 //web
+		 LambdaQueryWrapper<FbsPersonnel> lambdaQueryWrapper=new LambdaQueryWrapper<>();
+		 lambdaQueryWrapper.eq(FbsPersonnel::getPersonnelCode,userId);
+		 lambdaQueryWrapper.eq(FbsPersonnel::getDelFlag,"0");
+		 List<FbsPersonnel> fbsPersonnelList=iFbsPersonnelService.list(lambdaQueryWrapper);
+
+		 if(fbsPersonnelList.size() < 1){
 			 res.setCode("1");
 			 res.setMsg("人员编码不正确"+userId);
 			 return new ResponseEntity<ResHttpStatus>(res, HttpStatus.OK);
 		 }
-
 		 Map<String,String> map = new HashMap<>();
-		 map.put("userCode",entity.get(0).getCpersoncode());
-		 map.put("realName",entity.get(0).getCpersonname());
+		 map.put("userCode",fbsPersonnelList.get(0).getPersonnelCode());
+		 map.put("realName",fbsPersonnelList.get(0).getPersonnelName());
 
 		 res.setCode("0");
 		 res.setMsg("成功");
@@ -520,23 +558,43 @@ public class FbsWorkingStatisticsController {
 			 res.setMsg("人员编码不能为空-userId");
 			 return new ResponseEntity<ResHttpStatus>(res, HttpStatus.OK);
 		 }
-		 QueryWrapper<FbsWorkingStatistics> queryWrapper = new QueryWrapper<>();
-		 queryWrapper.eq("order_number", sheetId).eq("del_flag", 0);
-		 queryWrapper.eq("personnel_code", userId);
-		 List<FbsWorkingStatistics> list = fbsWorkingStatisticsService.list(queryWrapper);
+//		 QueryWrapper<FbsWorkingStatistics> queryWrapper = new QueryWrapper<>();
+//		 queryWrapper.eq("order_number", sheetId).eq("del_flag", 0);
+//		 queryWrapper.eq("personnel_code", userId);
+//		 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());
+
+		 QueryWrapper<FbsWorkshopDispatchList> queryWrapper = new QueryWrapper<>();
+		 queryWrapper.eq("production_order_number_name", sheetId).eq("del_flag", 0);
+		 queryWrapper.eq("personnel_id_u8", userId);
+		 List<FbsWorkshopDispatchList> list = fbsWorkshopDispatchListService.list(queryWrapper);
 		 if(list.size() < 1){
 			 res.setCode("1");
 			 res.setMsg("订单号或人员编码不正确"+sheetId);
 			 return new ResponseEntity<ResHttpStatus>(res, HttpStatus.OK);
 		 }
-		 FbsWorkingStatistics entity = list.get(0);
+
+		 FbsWorkshopDispatchList entity = list.get(0);
 		 Map<String,Object> map = new HashMap<>();
-		 map.put("orderCode",entity.getOrderNumber());
+		 map.put("orderCode",entity.getProductionOrderNumberName());
 		 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());
+		 map.put("materialCode",entity.getProductId());
+		 map.put("materialName",entity.getProduct());
+		 map.put("startDate",entity.getPlannedStartTime());
+		 map.put("endDate",entity.getPlannedEndTime());
 
 		 res.setCode("0");
 		 res.setMsg("成功");

src/main/java/org/jeecg/modules/fbsPuArrivalvouch/service/impl/FbsPuArrivalvouchServiceImpl.java

@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 import javax.annotation.Resource;
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -81,7 +82,7 @@ public class FbsPuArrivalvouchServiceImpl extends ServiceImpl<FbsPuArrivalvouchM
         //获取合格率数据
         List<FbsPuArrivalvouch> fbsPuArrivalvouchList=fbsPuArrivalvouchMapper.getCheckRateByBatchno();
         //封装map数据
-        Map<String,Object> map=new HashMap<>();
+        Map<String,Object> map=new LinkedHashMap<>();
         if(fbsPuArrivalvouchList!=null){
             for(FbsPuArrivalvouch fbsPuArrivalvouch:fbsPuArrivalvouchList){
                 map.put(fbsPuArrivalvouch.getCvencode(),fbsPuArrivalvouch.getPassRate());