wms / wms4_shenzhenxinyi · Commits

Commit 8dcf7994375b7f439899763abf4f88bc1822fcc7

Authored by 肖超群
1 parent a128d43c

修改agv分配库位方法

Inline Side-by-side
Showing 6 changed files with 22 additions and 12 deletions
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/acs/controller/AcsController.java
  View file @8dcf799
... ... @@ -69,13 +69,13 @@ public class AcsController extends HuahengBaseController {
69 69 return Result.error("分配AGV库位，数据为空");
70 70 }
71 71 String warehouseCode = agvWarecell.getWarehouseCode();
72   - String taskNo = agvWarecell.getTaskNo();
  72 + String containerCode = agvWarecell.getContainerCode();
73 73 String zoneCode = agvWarecell.getZoneCode();
74 74 if (StringUtils.isEmpty(warehouseCode)) {
75 75 return Result.error("仓位分配， 仓库号为空");
76 76 }
77   - if (StringUtils.isEmpty(taskNo)) {
78   - return Result.error("仓位分配， 任务号为空");
  77 + if (StringUtils.isEmpty(containerCode)) {
  78 + return Result.error("仓位分配， 托盘号为空");
79 79 }
80 80 if (StringUtils.isEmpty(zoneCode)) {
81 81 return Result.error("仓位分配， 目的区域为空");
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/acs/entity/AgvWarecell.java
  View file @8dcf799
... ... @@ -7,10 +7,10 @@ import lombok.Data;
7 7 public class AgvWarecell {
8 8  
9 9 /**
10   - * 任务号
  10 + * 托盘号
11 11 */
12   - @ApiModelProperty(value = "任务号", required = true)
13   - private String taskNo;
  12 + @ApiModelProperty(value = "托盘号", required = true)
  13 + private String containerCode;
14 14  
15 15 /**
16 16 * 仓库编号
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/acs/service/impl/AcsServiceImpl.java
  View file @8dcf799
... ... @@ -188,7 +188,7 @@ public class AcsServiceImpl implements IAcsService {
188 188 String warehouseCode = agvWarecell.getWarehouseCode();
189 189 String zoneCode = agvWarecell.getZoneCode();
190 190 String height = agvWarecell.getHeight();
191   - String taskNo = agvWarecell.getTaskNo();
  191 + String containerCode = agvWarecell.getContainerCode();
192 192 String fromPortCode = agvWarecell.getFromPortCode();
193 193  
194 194 Zone zone = zoneService.getZoneByCode(zoneCode, warehouseCode);
... ... @@ -198,10 +198,12 @@ public class AcsServiceImpl implements IAcsService {
198 198 if (StringUtils.isEmpty(fromPortCode)) {
199 199 return Result.error("分配库位时，起始站台为空");
200 200 }
201   - TaskHeader taskHeader = taskHeaderService.getById(taskNo);
  201 +
  202 + TaskHeader taskHeader = taskHeaderService.getUnCompleteTaskByContainerCode(containerCode, warehouseCode);
202 203 if (taskHeader == null) {
203 204 return Result.error("分配库位时，根据任务号没有找到任务");
204 205 }
  206 + int taskNo = taskHeader.getId();
205 207 if (taskHeader.getStatus() == QuantityConstant.TASK_STATUS_COMPLETED) {
206 208 return Result.error("分配库位时，任务已经完成不能再分库位");
207 209 }
... ... @@ -210,7 +212,7 @@ public class AcsServiceImpl implements IAcsService {
210 212 || taskType == QuantityConstant.TASK_TYPE_MANY_EMPTYSHIPMENT) {
211 213 return Result.error("分配库位时，整出类型的任务不需要分配库位");
212 214 }
213   - String containerCode = taskHeader.getContainerCode();
  215 +
214 216 if (StringUtils.isEmpty(containerCode)) {
215 217 return Result.error("分配库位时，任务托盘为空");
216 218 }
... ... @@ -295,7 +297,7 @@ public class AcsServiceImpl implements IAcsService {
295 297 }
296 298  
297 299 taskHeader = new TaskHeader();
298   - taskHeader.setId(Integer.parseInt(taskNo));
  300 + taskHeader.setId(taskNo);
299 301 taskHeader.setZoneCode(location.getZoneCode());
300 302 taskHeader.setAgvTaskId(agvTaskId);
301 303 taskHeader.setRoadWay(location.getRoadWay());
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/erp/controller/ErpController.java
  View file @8dcf799
... ... @@ -42,7 +42,7 @@ public class ErpController extends HuahengBaseController {
42 42  
43 43 @PostMapping("/cancelReceipt")
44 44 @ResponseBody
45   - @ApiOperation("取消入库单")
  45 + @ApiOperation("取消入库单[可选]")
46 46 @ApiLogger(apiName = "取消入库单", from = "ERP")
47 47 public Result cancelReceipt(@RequestBody ErpCancel erpCancel, HttpServletRequest req) {
48 48 String referCode = erpCancel.getReferCode();
... ... @@ -60,7 +60,7 @@ public class ErpController extends HuahengBaseController {
60 60  
61 61 @PostMapping("/cancelShipment")
62 62 @ResponseBody
63   - @ApiOperation("取消出库单")
  63 + @ApiOperation("取消出库单[可选]")
64 64 @ApiLogger(apiName = "取消出库单", from = "ERP")
65 65 public Result cancelShipment(@RequestBody ErpCancel erpCancel, HttpServletRequest req) {
66 66 String referCode = erpCancel.getReferCode();
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/erp/entity/ErpShipmentHeader.java
  View file @8dcf799
... ... @@ -36,5 +36,10 @@ public class ErpShipmentHeader {
36 36 */
37 37 @ApiModelProperty(value = "备注")
38 38 private String remark;
  39 + /**
  40 + * 库区编码
  41 + */
  42 + @ApiModelProperty(value = "库区编码")
  43 + private String zoneCode;
39 44  
40 45 }
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/erp/service/impl/ErpServiceImpl.java
  View file @8dcf799
... ... @@ -227,6 +227,7 @@ public class ErpServiceImpl implements IErpService {
227 227 String remark = erpShipmentHeader.getRemark();
228 228 String customerCode = erpShipmentHeader.getCustomerCode();
229 229 String warehouseCode = erpShipmentHeader.getWarehouseCode();
  230 + String zoneCode = erpShipmentHeader.getZoneCode();
230 231 if (StringUtils.isEmpty(warehouseCode)) {
231 232 return Result.error("出库单下发，仓库编码为空");
232 233 }
... ... @@ -255,6 +256,7 @@ public class ErpServiceImpl implements IErpService {
255 256 ShipmentHeader shipmentHeader = new ShipmentHeader();
256 257 shipmentHeader.setWarehouseCode(warehouseCode);
257 258 shipmentHeader.setCompanyCode(companyCode);
  259 + shipmentHeader.setZoneCode(zoneCode);
258 260 shipmentHeader.setType(shipmentType);
259 261 shipmentHeader.setReferCode(referCode);
260 262 shipmentHeader.setCustomerCode(customerCode);
... ... @@ -283,6 +285,7 @@ public class ErpServiceImpl implements IErpService {
283 285 ShipmentDetail shipmentDetail = new ShipmentDetail();
284 286 shipmentDetail.setWarehouseCode(warehouseCode);
285 287 shipmentDetail.setCompanyCode(companyCode);
  288 + shipmentDetail.setZoneCode(zoneCode);
286 289 shipmentDetail.setShipmentCode(shipmentHeader.getCode());
287 290 shipmentDetail.setShipmentId(shipmentHeader.getId());
288 291 shipmentDetail.setStatus(QuantityConstant.SHIPMENT_HEADER_BUILD);
... ...