|
|
@ -1280,47 +1280,7 @@ public class WcsIntegrationServiceImpl implements WcsIntegrationService { |
|
|
if (palletInfo == null) { |
|
|
if (palletInfo == null) { |
|
|
throw new Exception("栈板不存在"); |
|
|
throw new Exception("栈板不存在"); |
|
|
} |
|
|
} |
|
|
// 生成入库任务编号 |
|
|
|
|
|
TransNoControl transData2 = transNoService.getTransNo(site, "WOT", 10); |
|
|
|
|
|
Date currentTime = new Date(); |
|
|
|
|
|
// 创建运输任务记录 |
|
|
|
|
|
WmsOrderTask orderTask = new WmsOrderTask(); |
|
|
|
|
|
orderTask.setSite(site); |
|
|
|
|
|
orderTask.setTaskNo(transData2.getNewTransNo()); |
|
|
|
|
|
orderTask.setItemNo(1); // 固定为1 |
|
|
|
|
|
orderTask.setSourceType("组盘入库"); |
|
|
|
|
|
orderTask.setSourceBillNo(""); |
|
|
|
|
|
orderTask.setSourceLineId(0L); |
|
|
|
|
|
orderTask.setPartNo(""); // 栈板运输不需要物料信息 |
|
|
|
|
|
orderTask.setQty(BigDecimal.ZERO); |
|
|
|
|
|
orderTask.setBatchNo(""); |
|
|
|
|
|
orderTask.setSerialNo(""); |
|
|
|
|
|
orderTask.setFromLocation("无"); |
|
|
|
|
|
orderTask.setToLocation("无"); |
|
|
|
|
|
orderTask.setPalletId(palletId); |
|
|
|
|
|
orderTask.setAgvCode(""); |
|
|
|
|
|
orderTask.setPriority(1); // 优先级设置为5 |
|
|
|
|
|
orderTask.setStatus("已创建"); |
|
|
|
|
|
orderTask.setWmsSendTime(currentTime); |
|
|
|
|
|
orderTask.setCreatedBy(currentUser.getUsername()); |
|
|
|
|
|
orderTask.setCreatedTime(currentTime); |
|
|
|
|
|
orderTask.setUpdatedTime(currentTime); |
|
|
|
|
|
orderTask.setFinishQty(BigDecimal.ZERO); |
|
|
|
|
|
|
|
|
|
|
|
// 保存运输任务到数据库 |
|
|
|
|
|
wcsIntegrationMapper.insertOrderTask(orderTask); |
|
|
|
|
|
// 保存运输任务到数据库 |
|
|
|
|
|
|
|
|
|
|
|
WmsOrderTaskDetail detail2 = new WmsOrderTaskDetail(); |
|
|
|
|
|
detail2.setSite(orderTask.getSite()); |
|
|
|
|
|
detail2.setTaskNo(orderTask.getTaskNo()); |
|
|
|
|
|
detail2.setItemNo(orderTask.getItemNo()); |
|
|
|
|
|
detail2.setPalletId(palletId); |
|
|
|
|
|
detail2.setWmsStatus("未执行"); |
|
|
|
|
|
detail2.setSeqNo(1); |
|
|
|
|
|
detail2.setActionType("栈板入库"); |
|
|
|
|
|
detail2.setStatus("进行中"); |
|
|
|
|
|
wcsIntegrationMapper.insertWmsOrderTaskDetail(detail2); |
|
|
|
|
|
// 调用AGV接口创建任务 |
|
|
// 调用AGV接口创建任务 |
|
|
// List<String> targets = Arrays.asList(request.getStartStation()); |
|
|
// List<String> targets = Arrays.asList(request.getStartStation()); |
|
|
// agvClientUtil.createTask(task.getTaskNo(), targets, null, task.getPriority()); |
|
|
// agvClientUtil.createTask(task.getTaskNo(), targets, null, task.getPriority()); |
|
|
@ -1329,7 +1289,7 @@ public class WcsIntegrationServiceImpl implements WcsIntegrationService { |
|
|
|
|
|
|
|
|
// 调用pushPalletDetailNew方法推送组托数据 |
|
|
// 调用pushPalletDetailNew方法推送组托数据 |
|
|
// taskNo传空字符串,itemNo传0 |
|
|
// taskNo传空字符串,itemNo传0 |
|
|
pushPalletDetailNew(site, palletId, orderTask.getTaskNo(), orderTask.getItemNo(),"N"); |
|
|
|
|
|
|
|
|
pushPalletDetailNew(site, palletId, "", 0,"N"); |
|
|
|
|
|
|
|
|
System.out.println("本次组托完成 "); |
|
|
System.out.println("本次组托完成 "); |
|
|
} |
|
|
} |
|
|
|