Commit f3022266a228473eeecde0132e79e6e4fb110c1a

Authored by 肖超群
1 parent 28b1d140

完善锁站台功能

huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptContainerHeader/service/impl/ReceiptContainerHeaderServiceImpl.java
@@ -141,7 +141,7 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl<ReceiptContai @@ -141,7 +141,7 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl<ReceiptContai
141 String fromLocationCode = receiptContainerHeader.getFromLocationCode(); 141 String fromLocationCode = receiptContainerHeader.getFromLocationCode();
142 String toLocationCode = receiptContainerHeader.getToLocationCode(); 142 String toLocationCode = receiptContainerHeader.getToLocationCode();
143 int taskType = receiptContainerHeader.getTaskType(); 143 int taskType = receiptContainerHeader.getTaskType();
144 -// String fromPort = receiptContainerHeader.getFromPort(); 144 + String fromPort = receiptContainerHeader.getFromPort();
145 String toPort = receiptContainerHeader.getToPort(); 145 String toPort = receiptContainerHeader.getToPort();
146 Container container = containerService.getContainerByCode(containerCode, warehouseCode); 146 Container container = containerService.getContainerByCode(containerCode, warehouseCode);
147 if (container == null) { 147 if (container == null) {
@@ -194,6 +194,7 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl<ReceiptContai @@ -194,6 +194,7 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl<ReceiptContai
194 taskHeader.setWarehouseCode(warehouseCode); 194 taskHeader.setWarehouseCode(warehouseCode);
195 taskHeader.setZoneCode(zoneCode); 195 taskHeader.setZoneCode(zoneCode);
196 taskHeader.setToPortCode(toPort); 196 taskHeader.setToPortCode(toPort);
  197 + taskHeader.setFromPortCode(fromPort);
197 if (StringUtils.isNotEmpty(zone.getType())) { 198 if (StringUtils.isNotEmpty(zone.getType())) {
198 if (zone.getType().equals(QuantityConstant.ZONE_TYPE_AGV)) { 199 if (zone.getType().equals(QuantityConstant.ZONE_TYPE_AGV)) {
199 taskHeader.setToWcs(QuantityConstant.NOT_TO_WCS); 200 taskHeader.setToWcs(QuantityConstant.NOT_TO_WCS);
@@ -279,8 +280,8 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl<ReceiptContai @@ -279,8 +280,8 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl<ReceiptContai
279 if (StringUtils.isNotEmpty(value)) { 280 if (StringUtils.isNotEmpty(value)) {
280 int lockStation = Integer.parseInt(value); 281 int lockStation = Integer.parseInt(value);
281 if (lockStation == QuantityConstant.START_LOCK_STATION) { 282 if (lockStation == QuantityConstant.START_LOCK_STATION) {
282 - if (!lockStationService.lockStation(toPort, warehouseCode)) {  
283 - throw new JeecgBootException("生成入库任务时,站台已经锁定:" + toPort); 283 + if (!lockStationService.lockStation(fromPort, warehouseCode)) {
  284 + throw new JeecgBootException("生成入库任务时,站台已经锁定:" + fromPort);
284 } 285 }
285 } 286 }
286 } 287 }