wms / wms4_andelichi · Commits

Commit 1b50b52153c598b05b57b5bca0f5b4ca957336c0

Authored by 肖超群
1 parent 9936c6e3

MES生成入库任务

Inline Side-by-side
Showing 4 changed files with 29 additions and 4 deletions
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/api/mes/entity/MesReceiptMaterial.java
  View file @1b50b52
... ... @@ -10,6 +10,7 @@ public class MesReceiptMaterial {
10 10  
11 11 private String referCode;
12 12 private String containerCode;
  13 + private String toPort;
13 14 private List<MaterialInfo> materialInfoList;
14 15  
15 16 }
... ...
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/api/mes/servuce/impl/MesServiceImpl.java
  View file @1b50b52
1 1 package org.jeecg.modules.wms.api.mes.servuce.impl;
2 2  
  3 +import com.aliyun.oss.ServiceException;
3 4 import org.jeecg.common.api.vo.Result;
4 5 import org.jeecg.modules.wms.api.mes.entity.MaterialInfo;
5 6 import org.jeecg.modules.wms.api.mes.entity.MesReceiptMaterial;
6 7 import org.jeecg.modules.wms.api.mes.servuce.IMesService;
  8 +import org.jeecg.modules.wms.receipt.receiptContainerHeader.entity.ReceiptContainerHeader;
  9 +import org.jeecg.modules.wms.receipt.receiptContainerHeader.service.IReceiptContainerHeaderService;
7 10 import org.jeecg.modules.wms.receipt.receiptHeader.entity.ReceiptDetail;
8 11 import org.jeecg.modules.wms.receipt.receiptHeader.entity.ReceiptHeader;
9 12 import org.jeecg.modules.wms.receipt.receiptHeader.service.IReceiptDetailService;
... ... @@ -28,6 +31,8 @@ public class MesServiceImpl implements IMesService {
28 31 @Resource
29 32 private IReceiptDetailService receiptDetailService;
30 33 @Resource
  34 + private IReceiptContainerHeaderService receiptContainerHeaderService;
  35 + @Resource
31 36 private IReceiveService receiveService;
32 37  
33 38 /**
... ... @@ -39,15 +44,19 @@ public class MesServiceImpl implements IMesService {
39 44 List<Receive> receiveList = new ArrayList<>();
40 45 String referCode = mesReceiptMaterial.getReferCode();
41 46 String containerCode = mesReceiptMaterial.getContainerCode();
  47 + String toPort = mesReceiptMaterial.getToPort();
42 48 List<MaterialInfo> materialInfoList = mesReceiptMaterial.getMaterialInfoList();
43 49 ReceiptHeader receiptHeader = receiptHeaderService.getReceiptHeaderByReferCode(referCode, warehouseCode);
44 50 List<ReceiptDetail> receiptDetailList = receiptDetailService.selectByMainId(String.valueOf(receiptHeader.getId()));
45 51 for (ReceiptDetail receiptDetail : receiptDetailList) {
46 52 String materialCode = receiptDetail.getMaterialCode();
  53 + BigDecimal taskQty = BigDecimal.ZERO;
47 54 boolean hav = false;
48 55 for (MaterialInfo materialInfo : materialInfoList) {
49 56 if(materialInfo.getMaterialCode().equals(materialCode)) {
50 57 hav = true;
  58 + taskQty = materialInfo.getQty();
  59 + break;
51 60 }
52 61 }
53 62 if(hav) {
... ... @@ -60,11 +69,25 @@ public class MesServiceImpl implements IMesService {
60 69 receive.setMaterialUnit(receiptDetail.getMaterialUnit());
61 70 receive.setInventoryStatus(receiptDetail.getInventoryStatus());
62 71 receive.setQty(receiptDetail.getQty());
63   - receive.setTaskQty(BigDecimal.ZERO);
  72 + receive.setTaskQty(taskQty);
64 73 receiveList.add(receive);
65 74 }
66 75 }
67   - return receiveService.receiving(receiveList, warehouseCode);
  76 + Result result = receiveService.receiving(receiveList, warehouseCode);
  77 + if(!result.isSuccess()) {
  78 + throw new ServiceException(result.getMessage());
  79 + }
  80 + ReceiptContainerHeader receiptContainerHeader = receiptContainerHeaderService.
  81 + getUnCompleteReceiptContainerByCode(containerCode, warehouseCode);
  82 + if(receiptContainerHeader == null) {
  83 + throw new ServiceException(result.getMessage());
  84 + }
  85 + receiptContainerHeader.setToPort(toPort);
  86 + boolean success = receiptContainerHeaderService.updateById(receiptContainerHeader);
  87 + if(!success) {
  88 + throw new ServiceException("更新入库组盘头失败");
  89 + }
  90 + return receiptContainerHeaderService.createReceiptTask(receiptContainerHeader, warehouseCode);
68 91 }
69 92  
70 93 @Override
... ...
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/api/wcs/service/LocationAllocationServiceImpl.java
  View file @1b50b52
... ... @@ -108,7 +108,7 @@ public class LocationAllocationServiceImpl implements LocationAllocationService
108 108 roadWays = locationList.stream().map(Location::getRoadWay).distinct().collect(toList());
109 109 }
110 110 String value = parameterConfigurationService.getValueByCode(QuantityConstant.DOUBLE_FORK_RESERVE_LOCATION);
111   - int reserveNumber = 10;
  111 + int reserveNumber = 4;
112 112 if(StringUtils.isNotEmpty(value)) {
113 113 reserveNumber = Integer.parseInt(value);
114 114 }
... ...
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/container/service/impl/ContainerServiceImpl.java
  View file @1b50b52
... ... @@ -86,7 +86,8 @@ public class ContainerServiceImpl extends ServiceImpl&lt;ContainerMapper, Container
86 86 }
87 87  
88 88 @Override
89   - public boolean updateLocationCodeAndStatus(String containerCode, String locationCode, String status, String warehouseCode) {
  89 + public boolean updateLocationCodeAndStatus(String containerCode, String locationCode,
  90 + String status, String warehouseCode) {
90 91 Container container = getContainerByCode(containerCode, warehouseCode);
91 92 if(container == null) {
92 93 return false;
... ...