diff --git a/src/main/java/com/gaotao/modules/api/entity/NotifyDataToWcs.java b/src/main/java/com/gaotao/modules/api/entity/NotifyDataToWcs.java index f5fd13a..717bae6 100644 --- a/src/main/java/com/gaotao/modules/api/entity/NotifyDataToWcs.java +++ b/src/main/java/com/gaotao/modules/api/entity/NotifyDataToWcs.java @@ -11,5 +11,6 @@ public class NotifyDataToWcs { private String taskNo;//任务单号 private Integer itemNo; //任务行号 private String orderNo;//生产订单 + private String orderPartNo; private List materialRequisitions; } diff --git a/src/main/java/com/gaotao/modules/api/service/impl/WmsMessageServiceImpl.java b/src/main/java/com/gaotao/modules/api/service/impl/WmsMessageServiceImpl.java index 0286842..a1a184a 100644 --- a/src/main/java/com/gaotao/modules/api/service/impl/WmsMessageServiceImpl.java +++ b/src/main/java/com/gaotao/modules/api/service/impl/WmsMessageServiceImpl.java @@ -415,6 +415,9 @@ public class WmsMessageServiceImpl implements WmsMessageService { // 保存到WCS回调任务表 wcsIntegrationMapper.insertWcsCallbackTask(callbackTask); + //查询下 如果这个栈板没有预约任务取走,且栈板上有被预留的物料 那么直接去缓存区 + + }else if ("入库".equals(inData.getTransTypeDesc())||"出库".equals(inData.getTransTypeDesc())) { // 4. 保存WCS回调数据到新表,等待定时任务处理 WcsCallbackTask callbackTask = new WcsCallbackTask(); diff --git a/src/main/java/com/gaotao/modules/notify/mapper/NewIssureMapper.java b/src/main/java/com/gaotao/modules/notify/mapper/NewIssureMapper.java index 5b49495..cb30b29 100644 --- a/src/main/java/com/gaotao/modules/notify/mapper/NewIssureMapper.java +++ b/src/main/java/com/gaotao/modules/notify/mapper/NewIssureMapper.java @@ -114,7 +114,8 @@ public interface NewIssureMapper { * 根据notifyNo和productionOrderNo查询itemNo - rqrq */ BigDecimal getItemNoByNotifyNoAndOrderNo(@Param("site") String site, @Param("notifyNo") String notifyNo, @Param("productionOrderNo") String productionOrderNo); - + String getFgPartNoWithNotifyNo(@Param("site") String site, @Param("notifyNo") String notifyNo, @Param("productionOrderNo") String productionOrderNo); + /** * 更新handling_unit的reserve标志 - rqrq */ diff --git a/src/main/java/com/gaotao/modules/notify/service/impl/NewIssureServiceImpl.java b/src/main/java/com/gaotao/modules/notify/service/impl/NewIssureServiceImpl.java index ccf628a..85c6792 100644 --- a/src/main/java/com/gaotao/modules/notify/service/impl/NewIssureServiceImpl.java +++ b/src/main/java/com/gaotao/modules/notify/service/impl/NewIssureServiceImpl.java @@ -776,6 +776,7 @@ public class NewIssureServiceImpl implements NewIssureService { // 7.1 获取itemNo - rqrq BigDecimal itemNo = newIssureMapper.getItemNoByNotifyNoAndOrderNo(site, notifyNo, productionOrderNo); + String fgPartNo=newIssureMapper.getFgPartNoWithNotifyNo(site, notifyNo, productionOrderNo); if (itemNo == null) { throw new RuntimeException("未找到订单" + productionOrderNo + "的itemNo"); } @@ -896,7 +897,7 @@ public class NewIssureServiceImpl implements NewIssureService { wcsData.setTaskNo(taskNo); wcsData.setOrderNo(productionOrderNo); wcsData.setItemNo(orderTask.getItemNo()); - + wcsData.setOrderPartNo(fgPartNo); // 构建栈板列表 - rqrq List palletList = new ArrayList<>(); for (String palletId : orderPalletIds) { diff --git a/src/main/resources/mapper/notify/NewIssureMapper.xml b/src/main/resources/mapper/notify/NewIssureMapper.xml index b45fb1c..0550a3c 100644 --- a/src/main/resources/mapper/notify/NewIssureMapper.xml +++ b/src/main/resources/mapper/notify/NewIssureMapper.xml @@ -188,7 +188,14 @@ +