修改收货是是否收完的判断

mahuandong
1 parent fdcf40a0
Showing 4 changed files with 35 additions and 20 deletions
src/main/java/com/huaheng/api/wcs/service/warecellAllocation/WarecellAllocationServiceImpl.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/receipt/receiving/service/ReceivingService.java
@@ -212,6 +212,7 @@ public class WarecellAllocationServiceImpl implements WarecellAllocationService 
      * @param receiptContainerDetail
      * @return
      */
+    @Override
     public String taskPositioning(ReceiptContainerDetail receiptContainerDetail){
         ReceiptContainerHeader receiptContainerHeader = receiptContainerHeaderService.getById(receiptContainerDetail.getReceiptContainerId());
         String locatingRule = receiptContainerHeader.getLocatingRule(); //定位规则
@@ -37,6 +37,10 @@ import java.util.Arrays;
 import java.util.Comparator;
 import java.util.List;
  
+/**
+ * 入库组盘头表控制
+ * @author mahuaheng
+ */
 @Controller
 @RequestMapping("/receipt/receiptContainerHeader")
 public class ReceiptContainerHeaderController extends BaseController {
@@ -155,8 +159,10 @@ public class ReceiptContainerHeaderController extends BaseController {
             LambdaQueryWrapper<ReceiptContainerDetail> lambda = Wrappers.lambdaQuery();
             lambda.eq(ReceiptContainerDetail::getReceiptContainerId, idList.get(i));
             List<ReceiptContainerDetail> receiptContainerDetails = receiptContainerDetailService.list(lambda);
-            for (ReceiptContainerDetail receiptContainerDetail : receiptContainerDetails)
-            receivingService.position(receiptContainerDetail);
+            for (ReceiptContainerDetail receiptContainerDetail : receiptContainerDetails){
+                receivingService.position(receiptContainerDetail);
+            }
+
         }
         return AjaxResult.success("定位成功");
     }
@@ -177,8 +183,9 @@ public class ReceiptContainerHeaderController extends BaseController {
             LambdaQueryWrapper<ReceiptContainerDetail> lambda = Wrappers.lambdaQuery();
             lambda.eq(ReceiptContainerDetail::getReceiptContainerId, idList.get(i));
             List<ReceiptContainerDetail> receiptContainerDetails = receiptContainerDetailService.list(lambda);
-            for (ReceiptContainerDetail receiptContainerDetail : receiptContainerDetails)
+            for (ReceiptContainerDetail receiptContainerDetail : receiptContainerDetails) {
                 receivingService.cancelPosition(receiptContainerDetail);
+            }
         }
         return AjaxResult.success("取消定位成功");
     }
@@ -130,7 +130,7 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl&lt;ReceiptContai
  
         receiptContainerDetailAdd(receiptContainerHeaders.get(0).getId(), receiptDetail, qty, containerCode, locationCode);
         //如果单据数量等于已收数量，更新入库详情状态和入库单状态
-        if (receiptDetail.getTotalQty() == receiptDetail.getOpenQty()){
+        if (receiptDetail.getTotalQty().equals(receiptDetail.getOpenQty())){
             receiptDetail.setProcessStamp("200");
             if (!receiptDetailService.updateById(receiptDetail)){
                 throw new ServiceException("更新入库详情处理标记失败");
@@ -214,7 +214,8 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl&lt;ReceiptContai
             lambdaQueryWrapper.eq(Material::getCode, materialCode);
             Material material = materialService.getOne(lambdaQueryWrapper);
             if (material.getAutoGenSerialNum() == 0){
-               return 1; //需自动生成容器编码
+               return 1;
+               //需自动生成容器编码
             } else {
                 throw new ServiceException("容器不能为空");
             }
@@ -233,9 +234,9 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl&lt;ReceiptContai
         lambdaQueryWrapper.eq(TaskHeader::getContainerCode, containerCode)
                 .lt(TaskHeader::getStatus, 100)
                 .eq(TaskHeader::getWarehouseCode, ShiroUtils.getWarehouseCode());
-        if (taskHeaderService.count(lambdaQueryWrapper) > 0)
+        if (taskHeaderService.count(lambdaQueryWrapper) > 0){
             throw new ServiceException("容器已经存在任务，请更换容器");
-
+        }
         if ("empty".equals(container.getStatus())){
             return 100;
         }else if ("some".equals(container.getStatus())) {
@@ -257,10 +258,11 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl&lt;ReceiptContai
     Boolean checkLocationCode(String locationCode, String containerCode, Integer taskType) {
         //如果选了库位，就要校验库位和已经组盘的库位是否一致，避免重入库
         if (StringUtils.isEmpty(locationCode)) {
-            if  ("200".equals(locationCode))
+            if  ("200".equals(locationCode)) {
                 throw new ServiceException("补充入库，必须填写库位");
-            else
+            } else {
                 return  true;
+            }
         }
  
         //查询组盘头表
@@ -272,10 +274,11 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl&lt;ReceiptContai
         ReceiptContainerHeader receiptContainerHeader = this.getOne(lambda);
  
         if (receiptContainerHeader != null) {
-            if (receiptContainerHeader.getToLocation().equals(locationCode))
+            if (receiptContainerHeader.getToLocation().equals(locationCode)) {
                 return true;
-            else
+            } else {
                 throw new ServiceException("容器(" + containerCode + ")对应的库位是：" + receiptContainerHeader.getToLocation());
+            }
         }
  
         LambdaQueryWrapper<Location> lambdaLocation = Wrappers.lambdaQuery();
@@ -283,20 +286,23 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl&lt;ReceiptContai
                 .eq(Location::getDeleted, false)
                 .eq(Location::getCode, locationCode);
         Location location = locationService.getOne(lambdaLocation);
-        if (location == null)
+        if (location == null) {
             throw new ServiceException("库位不存在！");
-        if (location.getStatus().equals("empty") == false)
+        }
+        if (!"empty".equals(location.getStatus()) ) {
             throw new ServiceException("库位不是空闲状态！");
+        }
         if ("100".equals(taskType)) {
-            if (com.huaheng.common.utils.StringUtils.isNotEmpty(location.getContainerCode()))
+            if (StringUtils.isNotEmpty(location.getContainerCode())){
                 throw new ServiceException("库位(" + containerCode + ")有容器(" + location.getContainerCode() + ")，不能整盘入库！");
+            }
         }
         if("200".equals(taskType))  {
-            if (com.huaheng.common.utils.StringUtils.isEmpty(location.getContainerCode()))
+            if (com.huaheng.common.utils.StringUtils.isEmpty(location.getContainerCode())) {
                 throw new ServiceException("库位(" + locationCode + ")没有容器，不能补充入库！");
-            else
-            if (location.getContainerCode().equals(containerCode) == false)
+            } else if (!location.getContainerCode().equals(containerCode)) {
                 throw new ServiceException("库位(" + containerCode + ")对应的容器是：" + location.getContainerCode()+ "，请重选库位！");
+            }
         }
  
         LambdaQueryWrapper<Location> lambdaQueryWrapper = Wrappers.lambdaQuery();
@@ -84,12 +84,13 @@ public class ReceivingService {
     @Transactional
     public Boolean position(ReceiptContainerDetail receiptContainerDetail){
         ReceiptContainerHeader receiptContainerHeader = receiptContainerHeaderService.getById(receiptContainerDetail.getReceiptContainerId());
-        if (!(0 ==receiptContainerHeader.getStatus())){
+        if (0 !=receiptContainerHeader.getStatus()){
             throw new ServiceException("该入库组盘已生成任务不能重新定位");
         }
         //如果入库组盘表中有目标库位说明已经指定
         if (StringUtils.isNotEmpty(receiptContainerHeader.getToLocation())){return true;}
-        String locatingRule = receiptContainerHeader.getLocatingRule(); //定位规则
+        /*定位规则*/
+        String locatingRule = receiptContainerHeader.getLocatingRule();
         if (StringUtils.isEmpty(locatingRule)){
             locatingRule = receiptDetailService.getById(receiptContainerDetail.getReceiptDetailId()).getLocatingRule();
             //入库单明细定位规则不为空时执行
@@ -177,7 +178,7 @@ public class ReceivingService {
     public AjaxResult cancelPosition(ReceiptContainerDetail receiptContainerDetail){
         //查询入库组盘头
         ReceiptContainerHeader receiptContainerHeader = receiptContainerHeaderService.getById(receiptContainerDetail.getReceiptContainerId());
-        if (!(receiptContainerHeader.getStatus() == 0)){
+        if (receiptContainerHeader.getStatus() != 0){
             throw new ServiceException("组盘已生成任务不能取消定位");
         }
         //将入库组盘头表中的而库位编码赋值null