wms / wms_tianjinggelinmei · Commits

Commit b3c7cfe2ad0cbac3aadfae6234d6c09fe3ab3b20

Authored by 易文鹏
1 parent c3f9a32a

成品入库回传新增单据id字段，防止重复

Inline Side-by-side
Showing 6 changed files with 13 additions and 8344 deletions
sql/wms_v2_hh0628.sql deleted
View file @c3f9a32
No preview for this file type
src/main/java/com/huaheng/api/erp/service/TaskReturnServiceImpl.java
  View file @b3c7cfe
... ... @@ -101,12 +101,14 @@ public class TaskReturnServiceImpl implements TaskReturnService {
101 101 //装配
102 102 if ("1".equals(barCodeHeader.getProType())) {
103 103 Fentity fentity = new Fentity();
  104 + fentity.setFentityId(barCodeHeader.getCode());
104 105 fentity.setFqty1(new BigDecimal(barCodeHeader.getTotalLines()));
105 106 fentity.setFmaterial(barCodeDetailList.get(0).getMaterialCode());
106 107 fentity.setFstock("CK002");
107 108 fentities.add(fentity);
108 109 } else {
109 110 Fentity fentity = new Fentity();
  111 + fentity.setFentityId(barCodeHeader.getCode());
110 112 //两种拆解形式 ReceiptNote为-1，传重量过去就行
111 113 if (barCodeHeader.getReceiptNote()==-1) {
112 114 fentity.setFqty1(barCodeDetailList.get(0).getWeight());
... ...
src/main/java/com/huaheng/pc/monitor/job/domain/Fentity.java
  View file @b3c7cfe
... ... @@ -6,6 +6,7 @@ import java.math.BigDecimal;
6 6  
7 7 @Data
8 8 public class Fentity {
  9 + private String fentityId;//唯一ID
9 10 private String fmaterial;//物料编码
10 11 private BigDecimal fqty1;
11 12 private BigDecimal fqty2;
... ...
src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/controller/ReceiptContainerHeaderController.java
  View file @b3c7cfe
... ... @@ -187,7 +187,9 @@ public class ReceiptContainerHeaderController extends BaseController {
187 187 // return receiptTaskService.createReceiptTask(idsList);
188 188 // }
189 189 //});
190   - return receiptTaskService.createReceiptTask(idsList);
  190 + AjaxResult result = receiptTaskService.createReceiptTask(idsList);
  191 +
  192 + return result;
191 193 }
192 194  
193 195 /**
... ...
src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderServiceImpl.java
  View file @b3c7cfe
... ... @@ -832,7 +832,6 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl<ReceiptContai
832 832 receiptContainerDetail.setInventorySts(receiptDetail.getInventorySts());
833 833 receiptContainerDetail.setCreatedBy(ShiroUtils.getLoginName());
834 834 receiptContainerDetail.setLastUpdatedBy(ShiroUtils.getLoginName());
835   - //04-28
836 835 receiptContainerDetail.setMaterialGrossWeight(receiptDetail.getMaterialGrossWeight());
837 836 receiptContainerDetail.setMaterialTareWeight(receiptDetail.getMaterialTareWeight());
838 837 receiptContainerDetail.setMaterialNetWeight(receiptDetail.getMaterialNetWeight());
... ... @@ -876,10 +875,6 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl<ReceiptContai
876 875 }
877 876 return AjaxResult.success("保存入库组盘详情成功");
878 877 }
879   -
880   -
881   -
882   -
883 878 } else {
884 879 receiptContainerDetail.setQty(receiptContainerDetail.getQty().add(qty));
885 880 if (!receiptContainerDetailService.updateById(receiptContainerDetail)){
... ... @@ -950,7 +945,7 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl<ReceiptContai
950 945 if (!receiptDetailService.updateById(receiptDetail1)){
951 946 throw new ServiceException("更新入库详情下一流程失败");
952 947 }
953   -
  948 +
954 949 }
955 950 receiptDetailService.updateReceiptHeaderLastStatusByReceiptHeaderId(detaillist,receiptHeader);
956 951 return AjaxResult.success("保存入库组盘详情成功");
... ...
src/main/java/com/huaheng/pc/task/taskHeader/service/ReceiptTaskService.java
  View file @b3c7cfe
... ... @@ -145,14 +145,10 @@ public class ReceiptTaskService {
145 145 //锁定容器
146 146 containerService.updateStatus(receiptContainerHeader.getContainerCode(), QuantityConstant.STATUS_CONTAINER_LOCK, container.getWarehouseCode());
147 147 //查询入库组盘明细
148   - LambdaQueryWrapper<ReceiptContainerDetail> containerDetailLambda = Wrappers.lambdaQuery();
149   - containerDetailLambda.eq(ReceiptContainerDetail::getReceiptContainerId, id);
150   - List<ReceiptContainerDetail> list = receiptContainerDetailService.list(containerDetailLambda);
151   -
  148 + List<ReceiptContainerDetail> list = receiptContainerDetailService.list(new LambdaQueryWrapper<ReceiptContainerDetail>().eq(ReceiptContainerDetail::getReceiptContainerId, id));
152 149 if (list.isEmpty()) {
153 150 throw new ServiceException("id:" + id + "的入库组盘，没有组盘明细，请先组盘！");
154 151 }
155   -
156 152 if(StringUtils.isNotEmpty(receiptContainerHeader.getFromLocation())) {
157 153 locationService.updateStatus(receiptContainerHeader.getFromLocation(), QuantityConstant.STATUS_LOCATION_LOCK);
158 154 }
... ... @@ -167,9 +163,9 @@ public class ReceiptTaskService {
167 163 if(!desLocation.getWarehouseCode().equals(loginWarehouse)) {
168 164 return AjaxResult.error("库位对应仓库不对");
169 165 }
170   - if (taskHeaderService.getUncompleteTaskInNear(desLocation) > 0) {
171   - return AjaxResult.error("目标库位：" + desLocation + "旁边存在任务，请完成任务以后再分配");
172   - }
  166 + //if (taskHeaderService.getUncompleteTaskInNear(desLocation) > 0) {
  167 + // return AjaxResult.error("目标库位：" + desLocation + "旁边存在任务，请完成任务以后再分配");
  168 + //}
173 169 }
174 170 if (receiptContainerHeader.getStatus() == QuantityConstant.RECEIPT_CONTAINER_BUILD.intValue()) {
175 171 if (receiptContainerHeader.getStatus() < QuantityConstant.RECEIPT_CONTAINER_TASK) {
... ... @@ -276,17 +272,6 @@ public class ReceiptTaskService {
276 272 if (!taskDetailService.save(taskDetail)) {
277 273 throw new ServiceException("生成任务明细失败");
278 274 }
279   -
280   - //如果有任务明细了，改组盘明细状态
281   - ReceiptContainerDetail one = receiptContainerDetailService.getOne(new LambdaQueryWrapper<ReceiptContainerDetail>()
282   - .eq(ReceiptContainerDetail::getReceiptId, taskDetail.getAllocationId()));
283   - if (one!=null) {
284   - one.setStatus(QuantityConstant.RECEIPT_CONTAINER_TASK);
285   - if (!receiptContainerDetailService.updateById(item)) {
286   - throw new ServiceException("更新入库组盘明细状态出错");
287   - }
288   - }
289   -
290 275 //更新入库组盘明细状态
291 276 item.setStatus(QuantityConstant.RECEIPT_CONTAINER_TASK);
292 277 if (!receiptContainerDetailService.updateById(item)) {
... ... @@ -325,8 +310,9 @@ public class ReceiptTaskService {
325 310 }
326 311 }
327 312 }
  313 + //return AjaxResult.success("生成任务成功").setData(taskIds);
  314 + return AjaxResult.success("生成任务成功");
328 315  
329   - return AjaxResult.success("生成上架任务成功").setData(taskIds);
330 316 }
331 317  
332 318 public WcsTask createWcsTask(TaskHeader task){
... ...