|
|
@ -157,6 +157,10 @@ public class YCLCKTask extends AbstractTask { |
|
|
|
if (taskObj.getTask_status().equals(TaskStatus.CANCELED.getCode())) { |
|
|
|
throw new BadRequestException("该任务已取消!"); |
|
|
|
} |
|
|
|
// 获取参数
|
|
|
|
JSONObject extGroupData = ObjectUtil.isNotEmpty(taskObj.getExt_group_data()) |
|
|
|
? JSONObject.parseObject(taskObj.getExt_group_data()) |
|
|
|
: null; |
|
|
|
String startPoint = taskObj.getPoint_code1(); // 获取起点
|
|
|
|
String endPoint = taskObj.getPoint_code2(); // 获取终点
|
|
|
|
SchBasePoint startPointObj = pointService.getById(startPoint); |
|
|
@ -228,8 +232,6 @@ public class YCLCKTask extends AbstractTask { |
|
|
|
.eq(Material::getPalletSN, taskObj.getVehicle_code2()) |
|
|
|
.eq(Material::getGroup_bind_material_status, GroupBindMaterialStatusEnum.BOUND.getValue())); |
|
|
|
if (ObjectUtil.isNotEmpty(materialList)) { |
|
|
|
PdmBdWorkorder pdmBdWorkorder=workorderService.getOne(new LambdaQueryWrapper<PdmBdWorkorder>() |
|
|
|
.eq(PdmBdWorkorder::getMaterial_id, materialList.get(0).getProductName())); |
|
|
|
String url = "http://192.168.9.5/sitAppWebApi/PDSToWMS/Api/QPMES065"; |
|
|
|
QPMES065Request qpmes065Request = new QPMES065Request(); |
|
|
|
List<QPMES065RequestBody> qpmes065RequestBodyList=new ArrayList<>(); |
|
|
@ -241,11 +243,11 @@ public class YCLCKTask extends AbstractTask { |
|
|
|
qpmes065Request.setHEAD(head); |
|
|
|
for(Material material:materialList) { |
|
|
|
QPMES065RequestBody qpmes065RequestBody=new QPMES065RequestBody(); |
|
|
|
qpmes065RequestBody.setMoname(pdmBdWorkorder!=null?pdmBdWorkorder.getWorkorder_code():null); |
|
|
|
qpmes065RequestBody.setMoname(extGroupData.getString("workorder_code")); |
|
|
|
qpmes065RequestBody.setLotSN(material.getPalletSN()); |
|
|
|
qpmes065RequestBody.setQty(String.valueOf(one.getMaterial_qty())); |
|
|
|
qpmes065RequestBody.setSiteName(material.getLocationCode()); |
|
|
|
qpmes065RequestBody.setZXXV01(pdmBdWorkorder!=null?"1":"0"); |
|
|
|
qpmes065RequestBody.setZXXV01(extGroupData.getString("workorder_code")!=null?"1":"0"); |
|
|
|
qpmes065RequestBodyList.add(qpmes065RequestBody); |
|
|
|
} |
|
|
|
qpmes065Request.setBODY(qpmes065RequestBodyList); |
|
|
|