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

易文鹏
1 parent c3f9a32a
Showing 6 changed files with 13 additions and 8344 deletions
sql/wms_v2_hh0628.sql
src/main/java/com/huaheng/api/erp/service/TaskReturnServiceImpl.java
src/main/java/com/huaheng/pc/monitor/job/domain/Fentity.java
src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/controller/ReceiptContainerHeaderController.java
src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderServiceImpl.java
src/main/java/com/huaheng/pc/task/taskHeader/service/ReceiptTaskService.java
@@ -101,12 +101,14 @@ public class TaskReturnServiceImpl implements TaskReturnService {
         //装配
         if ("1".equals(barCodeHeader.getProType())) {
             Fentity fentity = new Fentity();
+            fentity.setFentityId(barCodeHeader.getCode());
             fentity.setFqty1(new BigDecimal(barCodeHeader.getTotalLines()));
             fentity.setFmaterial(barCodeDetailList.get(0).getMaterialCode());
             fentity.setFstock("CK002");
             fentities.add(fentity);
         } else {
             Fentity fentity = new Fentity();
+            fentity.setFentityId(barCodeHeader.getCode());
             //两种拆解形式 ReceiptNote为-1，传重量过去就行
             if (barCodeHeader.getReceiptNote()==-1) {
                 fentity.setFqty1(barCodeDetailList.get(0).getWeight());
@@ -6,6 +6,7 @@ import java.math.BigDecimal;
 @Data
 public class Fentity {
+    private String fentityId;//唯一ID
     private String fmaterial;//物料编码
     private BigDecimal fqty1;
     private BigDecimal fqty2;
@@ -187,7 +187,9 @@ public class ReceiptContainerHeaderController extends BaseController {
         //        return receiptTaskService.createReceiptTask(idsList);
         //    }
         //});
-        return receiptTaskService.createReceiptTask(idsList);
+        AjaxResult result = receiptTaskService.createReceiptTask(idsList);
+
+        return result;
     }
     /**
@@ -832,7 +832,6 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl&lt;ReceiptContai
                     receiptContainerDetail.setInventorySts(receiptDetail.getInventorySts());
                     receiptContainerDetail.setCreatedBy(ShiroUtils.getLoginName());
                     receiptContainerDetail.setLastUpdatedBy(ShiroUtils.getLoginName());
-                    //04-28
                     receiptContainerDetail.setMaterialGrossWeight(receiptDetail.getMaterialGrossWeight());
                     receiptContainerDetail.setMaterialTareWeight(receiptDetail.getMaterialTareWeight());
                     receiptContainerDetail.setMaterialNetWeight(receiptDetail.getMaterialNetWeight());
@@ -876,10 +875,6 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl&lt;ReceiptContai
                 }
                 return AjaxResult.success("保存入库组盘详情成功");
             }
-
-
-
-
         } else {
             receiptContainerDetail.setQty(receiptContainerDetail.getQty().add(qty));
             if (!receiptContainerDetailService.updateById(receiptContainerDetail)){
@@ -950,7 +945,7 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl&lt;ReceiptContai
                     if (!receiptDetailService.updateById(receiptDetail1)){
                         throw new ServiceException("更新入库详情下一流程失败");
                     }
-                    
+
                 }
                 receiptDetailService.updateReceiptHeaderLastStatusByReceiptHeaderId(detaillist,receiptHeader);
                 return AjaxResult.success("保存入库组盘详情成功");
@@ -145,14 +145,10 @@ public class ReceiptTaskService {
             //锁定容器
             containerService.updateStatus(receiptContainerHeader.getContainerCode(), QuantityConstant.STATUS_CONTAINER_LOCK, container.getWarehouseCode());
             //查询入库组盘明细
-            LambdaQueryWrapper<ReceiptContainerDetail> containerDetailLambda = Wrappers.lambdaQuery();
-            containerDetailLambda.eq(ReceiptContainerDetail::getReceiptContainerId, id);
-            List<ReceiptContainerDetail> list = receiptContainerDetailService.list(containerDetailLambda);
-
+            List<ReceiptContainerDetail> list = receiptContainerDetailService.list(new LambdaQueryWrapper<ReceiptContainerDetail>().eq(ReceiptContainerDetail::getReceiptContainerId, id));
             if (list.isEmpty()) {
                 throw new ServiceException("id:" + id + "的入库组盘，没有组盘明细，请先组盘！");
             }
-
             if(StringUtils.isNotEmpty(receiptContainerHeader.getFromLocation())) {
                 locationService.updateStatus(receiptContainerHeader.getFromLocation(), QuantityConstant.STATUS_LOCATION_LOCK);
             }
@@ -167,9 +163,9 @@ public class ReceiptTaskService {
                 if(!desLocation.getWarehouseCode().equals(loginWarehouse)) {
                     return AjaxResult.error("库位对应仓库不对");
                 }
-                if (taskHeaderService.getUncompleteTaskInNear(desLocation) > 0) {
-                    return AjaxResult.error("目标库位：" + desLocation + "旁边存在任务，请完成任务以后再分配");
-                }
+                //if (taskHeaderService.getUncompleteTaskInNear(desLocation) > 0) {
+                //    return AjaxResult.error("目标库位：" + desLocation + "旁边存在任务，请完成任务以后再分配");
+                //}
             }
             if (receiptContainerHeader.getStatus() == QuantityConstant.RECEIPT_CONTAINER_BUILD.intValue()) {
                 if (receiptContainerHeader.getStatus() < QuantityConstant.RECEIPT_CONTAINER_TASK) {
@@ -276,17 +272,6 @@ public class ReceiptTaskService {
                         if (!taskDetailService.save(taskDetail)) {
                             throw new ServiceException("生成任务明细失败");
                         }
-
-                        //如果有任务明细了，改组盘明细状态
-                        ReceiptContainerDetail one = receiptContainerDetailService.getOne(new LambdaQueryWrapper<ReceiptContainerDetail>()
-                                .eq(ReceiptContainerDetail::getReceiptId, taskDetail.getAllocationId()));
-                        if (one!=null) {
-                            one.setStatus(QuantityConstant.RECEIPT_CONTAINER_TASK);
-                            if (!receiptContainerDetailService.updateById(item)) {
-                                throw new ServiceException("更新入库组盘明细状态出错");
-                            }
-                        }
-
                         //更新入库组盘明细状态
                         item.setStatus(QuantityConstant.RECEIPT_CONTAINER_TASK);
                         if (!receiptContainerDetailService.updateById(item)) {
@@ -325,8 +310,9 @@ public class ReceiptTaskService {
                 }
             }
         }
+        //return AjaxResult.success("生成任务成功").setData(taskIds);
+        return AjaxResult.success("生成任务成功");
-        return AjaxResult.success("生成上架任务成功").setData(taskIds);
     }
     public WcsTask createWcsTask(TaskHeader task){