Commit 5ac422d89a50a35a4654012d608cbfc4aa916145

Authored by xumiao
1 parent c6ccece2

edit

src/main/java/com/huaheng/api/acs/service/AcsServiceImpl.java
... ... @@ -880,6 +880,13 @@ public class AcsServiceImpl extends ServiceImpl<AcsMapper,AgvTask> implements Ac
880 880 agvPortService.setContainerCode(task.getToPort(),null);
881 881 iAgvInventoryService.removeByPortCode(task.getFromPort());
882 882 }
  883 + try {
  884 + if(task.getToPort().equals("Work 830")){
  885 + inventoryHeaderService.createEmptyIn(task.getContainerCode(), null);
  886 + }
  887 + }catch (Exception e) {
  888 + e.printStackTrace();
  889 + }
883 890 cancelContainerStatus(task);
884 891 }
885 892 if(o3.equals(QuantityConstant.STATUS_TASK_ERROR)){
... ...
src/main/java/com/huaheng/pc/task/taskHeader/service/WorkTaskService.java
... ... @@ -104,7 +104,7 @@ public class WorkTaskService {
104 104 }
105 105 if (StringUtils.isNotEmpty(receiptPreferences.get(0).getEmptyLocRule())) {
106 106 LambdaQueryWrapper<FilterConfigDetail> lambdaQueryWrapper = Wrappers.lambdaQuery();
107   - lambdaQueryWrapper.eq(FilterConfigDetail::getWarehouseCode, ShiroUtils.getWarehouseCode())
  107 + lambdaQueryWrapper.eq(FilterConfigDetail::getWarehouseCode, "CS0001")
108 108 .eq(FilterConfigDetail::getCode, receiptPreferences.get(0).getEmptyLocRule());
109 109 FilterConfigDetail filterConfigDetail = filterConfigDetailService.getOne(lambdaQueryWrapper);
110 110 if (StringUtils.isNull(filterConfigDetail)) {
... ... @@ -142,7 +142,7 @@ public class WorkTaskService {
142 142  
143 143 //创建主任务
144 144 TaskHeader taskHeader = new TaskHeader();
145   - taskHeader.setWarehouseCode(ShiroUtils.getWarehouseCode());
  145 + taskHeader.setWarehouseCode("CS0001");
146 146 taskHeader.setTaskType(QuantityConstant.TASK_TYPE_EMPTYRECEIPT);
147 147 taskHeader.setInternalTaskType(QuantityConstant.TASK_INTENERTYPE_RECEIPT);
148 148 Location location = locationService.getLocationByCode(destinationLocation);
... ...