|
|
|
@ -47,9 +47,9 @@ public class ProWetMaterialPlanServiceImpl implements IProWetMaterialPlanService
|
|
|
|
private ProOrderWorkorderMapper proOrderWorkorderMapper;
|
|
|
|
private ProOrderWorkorderMapper proOrderWorkorderMapper;
|
|
|
|
@Autowired
|
|
|
|
@Autowired
|
|
|
|
private ProWetMaterialPlanDetailMapper proWetMaterialPlanDetailMapper;
|
|
|
|
private ProWetMaterialPlanDetailMapper proWetMaterialPlanDetailMapper;
|
|
|
|
|
|
|
|
//
|
|
|
|
@Value("${wcs.url1}")
|
|
|
|
// @Value("${wcs.url1}")
|
|
|
|
public String materialPlanSyncUrl;
|
|
|
|
// public String materialPlanSyncUrl;
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* 查询湿料计划管理
|
|
|
|
* 查询湿料计划管理
|
|
|
|
*
|
|
|
|
*
|
|
|
|
@ -307,65 +307,65 @@ public class ProWetMaterialPlanServiceImpl implements IProWetMaterialPlanService
|
|
|
|
* ]
|
|
|
|
* ]
|
|
|
|
* }
|
|
|
|
* }
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
@Override
|
|
|
|
// @Override
|
|
|
|
@DS("#header.poolName")
|
|
|
|
// @DS("#header.poolName")
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
|
// @Transactional(rollbackFor = Exception.class)
|
|
|
|
public AjaxResult syncWCS(@PathVariable String id) {
|
|
|
|
// public AjaxResult syncWCS(@PathVariable String id) {
|
|
|
|
|
|
|
|
//
|
|
|
|
//获取湿料计划
|
|
|
|
// //获取湿料计划
|
|
|
|
WCSDTO wcsdto = new WCSDTO();
|
|
|
|
// WCSDTO wcsdto = new WCSDTO();
|
|
|
|
wcsdto.setReqCode(id);//主计划id
|
|
|
|
// wcsdto.setReqCode(id);//主计划id
|
|
|
|
wcsdto.setReqTime(DateUtils.getNowDate());
|
|
|
|
// wcsdto.setReqTime(DateUtils.getNowDate());
|
|
|
|
List<ProWetMaterialPlanDetail> planDetails = proWetMaterialPlanDetailMapper.selectDetailListById(id);
|
|
|
|
// List<ProWetMaterialPlanDetail> planDetails = proWetMaterialPlanDetailMapper.selectDetailListById(id);
|
|
|
|
|
|
|
|
//
|
|
|
|
//罐
|
|
|
|
// //罐
|
|
|
|
List<String> gList = planDetails.stream().map(ProWetMaterialPlanDetail::getBucketCode)
|
|
|
|
// List<String> gList = planDetails.stream().map(ProWetMaterialPlanDetail::getBucketCode)
|
|
|
|
.distinct().collect(Collectors.toList());
|
|
|
|
// .distinct().collect(Collectors.toList());
|
|
|
|
//罐-料
|
|
|
|
// //罐-料
|
|
|
|
Map<String, String> glMap = planDetails.stream()
|
|
|
|
// Map<String, String> glMap = planDetails.stream()
|
|
|
|
.collect(Collectors.toMap(ProWetMaterialPlanDetail::getBucketCode,
|
|
|
|
// .collect(Collectors.toMap(ProWetMaterialPlanDetail::getBucketCode,
|
|
|
|
ProWetMaterialPlanDetail::getMaterialCode, (k1, k2) -> k1));
|
|
|
|
// ProWetMaterialPlanDetail::getMaterialCode, (k1, k2) -> k1));
|
|
|
|
|
|
|
|
//
|
|
|
|
List<WCSDataDTO> data = new ArrayList<>();
|
|
|
|
// List<WCSDataDTO> data = new ArrayList<>();
|
|
|
|
WCSDataDTO wCSDataDTO = null;
|
|
|
|
// WCSDataDTO wCSDataDTO = null;
|
|
|
|
for (String g : gList) {
|
|
|
|
// for (String g : gList) {
|
|
|
|
wCSDataDTO = new WCSDataDTO();
|
|
|
|
// wCSDataDTO = new WCSDataDTO();
|
|
|
|
wCSDataDTO.setSku(glMap.get(g));//罐
|
|
|
|
// wCSDataDTO.setSku(glMap.get(g));//罐
|
|
|
|
wCSDataDTO.setLoadNo(g);//料
|
|
|
|
// wCSDataDTO.setLoadNo(g);//料
|
|
|
|
List<WCSDataItemsDTO> unLoadItems = new ArrayList<>();//上位机集合
|
|
|
|
// List<WCSDataItemsDTO> unLoadItems = new ArrayList<>();//上位机集合
|
|
|
|
//罐-工单
|
|
|
|
// //罐-工单
|
|
|
|
List<ProWetMaterialPlanDetail> ggList = planDetails.stream()
|
|
|
|
// List<ProWetMaterialPlanDetail> ggList = planDetails.stream()
|
|
|
|
.filter(plan -> plan.getBucketCode().equals(g))
|
|
|
|
// .filter(plan -> plan.getBucketCode().equals(g))
|
|
|
|
.collect(Collectors.toList());
|
|
|
|
// .collect(Collectors.toList());
|
|
|
|
WCSDataItemsDTO wCSDataItemsDTO = null;
|
|
|
|
// WCSDataItemsDTO wCSDataItemsDTO = null;
|
|
|
|
for (ProWetMaterialPlanDetail gg : ggList) {
|
|
|
|
// for (ProWetMaterialPlanDetail gg : ggList) {
|
|
|
|
//根据工单查收坯机编码
|
|
|
|
// //根据工单查收坯机编码
|
|
|
|
String bucketCode = proOrderWorkorderMapper.getBucketCodeByWorkId(gg.getWorkorderId());
|
|
|
|
// String bucketCode = proOrderWorkorderMapper.getBucketCodeByWorkId(gg.getWorkorderId());
|
|
|
|
if (StringUtils.isNotBlank(bucketCode)) {
|
|
|
|
// if (StringUtils.isNotBlank(bucketCode)) {
|
|
|
|
wCSDataItemsDTO = new WCSDataItemsDTO();
|
|
|
|
// wCSDataItemsDTO = new WCSDataItemsDTO();
|
|
|
|
wCSDataItemsDTO.setUnloadNo(bucketCode);
|
|
|
|
// wCSDataItemsDTO.setUnloadNo(bucketCode);
|
|
|
|
unLoadItems.add(wCSDataItemsDTO);
|
|
|
|
// unLoadItems.add(wCSDataItemsDTO);
|
|
|
|
}
|
|
|
|
// }
|
|
|
|
}
|
|
|
|
// }
|
|
|
|
wCSDataDTO.setUnLoadItems(unLoadItems);
|
|
|
|
// wCSDataDTO.setUnLoadItems(unLoadItems);
|
|
|
|
}
|
|
|
|
// }
|
|
|
|
wcsdto.setData(data);
|
|
|
|
// wcsdto.setData(data);
|
|
|
|
try {
|
|
|
|
// try {
|
|
|
|
String sendResult = HttpUtils.sendPost(materialPlanSyncUrl, JSON.toJSONString(wcsdto));
|
|
|
|
// String sendResult = HttpUtils.sendPost(materialPlanSyncUrl, JSON.toJSONString(wcsdto));
|
|
|
|
WCSDTO resultdto = JSON.parseObject(sendResult, WCSDTO.class);
|
|
|
|
// WCSDTO resultdto = JSON.parseObject(sendResult, WCSDTO.class);
|
|
|
|
if ("1".equals(resultdto.getCode())) {
|
|
|
|
// if ("1".equals(resultdto.getCode())) {
|
|
|
|
return error(resultdto.getMessage());
|
|
|
|
// return error(resultdto.getMessage());
|
|
|
|
}
|
|
|
|
// }
|
|
|
|
}catch (Exception e){
|
|
|
|
// }catch (Exception e){
|
|
|
|
return error("调用接口异常");
|
|
|
|
// return error("调用接口异常");
|
|
|
|
}
|
|
|
|
// }
|
|
|
|
|
|
|
|
//
|
|
|
|
ProWetMaterialPlan detail = new ProWetMaterialPlan();
|
|
|
|
// ProWetMaterialPlan detail = new ProWetMaterialPlan();
|
|
|
|
detail.setId(id);
|
|
|
|
// detail.setId(id);
|
|
|
|
detail.setSyncFlag("Y");//已经同步的标识
|
|
|
|
// detail.setSyncFlag("Y");//已经同步的标识
|
|
|
|
proWetMaterialPlanMapper.updateProWetMaterialPlan(detail);
|
|
|
|
// proWetMaterialPlanMapper.updateProWetMaterialPlan(detail);
|
|
|
|
return success();
|
|
|
|
// return success();
|
|
|
|
}
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* 创建湿料（主）计划
|
|
|
|
* 创建湿料（主）计划
|
|
|
|
|
zhaoxiaolin
2 years ago