diff --git a/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/WcsTaskServiceImpl.java b/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/WcsTaskServiceImpl.java index 0e9a5bd..3a56ffc 100644 --- a/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/WcsTaskServiceImpl.java +++ b/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/WcsTaskServiceImpl.java @@ -6,6 +6,7 @@ import com.gaotao.modules.api.service.WmsMessageService; import com.gaotao.modules.automatedWarehouse.entity.*; import com.gaotao.modules.automatedWarehouse.mapper.WcsIntegrationMapper; import com.gaotao.modules.automatedWarehouse.service.*; +import com.gaotao.modules.base.entity.PalletType; import com.gaotao.modules.handlingunit.entity.HandlingUnit; import com.gaotao.modules.notify.mapper.NewIssureMapper; import com.gaotao.modules.warehouse.dao.PalletMapper; @@ -370,7 +371,32 @@ public class WcsTaskServiceImpl implements WcsTaskService { callbackTask.getTaskNo(), callbackTask.getItemNo(), callbackTask.getPalletId()); - + if(transportTask.getPalletType()!=null&&!"".equals(transportTask.getPalletType())){ + // 判断如果取出来的托盘是空托,也就是pallet_detail查出来没有数据,那么把托盘类型改成任务单上面的托盘类型 - rqrq + int detailCount = wcsIntegrationMapper.countPalletDetails(callbackTask.getSite(), callbackTask.getPalletId()); + if (detailCount == 0) { + // 托盘是空托,根据任务单上的托盘类型查询pallet_type表获取auto_sort和sore_type - rqrq + PalletType palletTypeInfo = wcsIntegrationMapper.getPalletType(callbackTask.getSite(), transportTask.getPalletType()); + if (palletTypeInfo != null) { + String autoSort = palletTypeInfo.getWcsAutoSort(); + Integer soreType = palletTypeInfo.getWcsSoreType(); + String palletType = transportTask.getPalletType(); + // 更新托盘的pallet_type、sore_type、auto_sort - rqrq + wcsIntegrationMapper.updatePalletTypeAndAutoSort( + callbackTask.getSite(), + callbackTask.getPalletId(), + palletType, + autoSort, + soreType); + System.out.println("空托托盘类型更新成功 - rqrq,palletId=" + callbackTask.getPalletId() + + ", palletType=" + palletType + ", autoSort=" + autoSort + ", soreType=" + soreType); + } else { + System.out.println("未找到托盘类型信息 - rqrq,palletType=" + transportTask.getPalletType()); + } + } else { + System.out.println("托盘非空托,不更新托盘类型 - rqrq,palletId=" + callbackTask.getPalletId() + ", detailCount=" + detailCount); + } + } System.out.println("运输任务托盘ID更新成功 - rqrq,taskNo=" + callbackTask.getTaskNo() + ", 新托盘ID=" + callbackTask.getPalletId()); } else {