Merge remote-tracking branch 'origin/develop' into develop

mahuandong
2 parents fd33a748 f6c7715c
Showing 5 changed files with 219 additions and 40 deletions
src/main/java/com/huaheng/pc/inventory/cycleCountDetail/controller/CycleCountDetailController.java
src/main/java/com/huaheng/pc/inventory/cycleCountDetail/service/CycleCountDetailService.java
src/main/java/com/huaheng/pc/inventory/cycleCountDetail/service/CycleCountDetailServiceImpl.java
src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java
src/main/resources/templates/inventory/cycleCountDetail/cycleCountDetail.html
@@ -34,6 +34,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.util.Collections;
 import java.util.List;
@@ -118,7 +119,6 @@ public class CycleCountDetailController extends BaseController {
     }
-
     /**
      * 新增盘点明细
      */
@@ -215,10 +215,30 @@ public class CycleCountDetailController extends BaseController {
         return cycleCountDetailService.createCycleCoutTaskByDetailId(cycleCoutdetailId);
     }
+    /**
+     *实盘登记
+     * @param detailId
+     * @param qty
+     * @return
+     */
+    //@RequiresPermissions("inventory:cyclecountDetail:confirm")
+    @PostMapping("/confirmGapQty")
+    @ResponseBody
+    public AjaxResult confirmGapQty(Integer detailId, BigDecimal qty){
+        return cycleCountDetailService.confirmGapQty(detailId,qty);
+    }
-
-
-
+    /**
+     * 差异复盘
+     * @param cycleCountHeadCode
+     * @return
+     */
+    //@RequiresPermissions("inventory:cyclecountDetail:cyclecountRepeat")
+    @PostMapping("/createCyclecountWithGapQty")
+    @ResponseBody
+    public AjaxResult createCyclecountWithGapQty(String cycleCountHeadCode){
+        return cycleCountDetailService.createCyclecountWithGapQty(cycleCountHeadCode);
+    }
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.huaheng.framework.web.domain.AjaxResult;
 import com.huaheng.pc.inventory.cycleCountDetail.domain.CycleCountDetail;
+import java.math.BigDecimal;
 public interface CycleCountDetailService extends IService<CycleCountDetail> {
@@ -15,7 +16,11 @@ public interface CycleCountDetailService extends IService&lt;CycleCountDetail&gt; {
     AjaxResult createCycleCoutTaskByDetailId(Integer cycleCoutdetailId);
+    AjaxResult confirmGapQty(Integer detailId, BigDecimal qty);
+    void updataDetailStatus(Integer detailid,Integer status);
+
+    AjaxResult createCyclecountWithGapQty(String cycleCountHeadCode);
@@ -23,6 +23,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -46,6 +47,43 @@ public class CycleCountDetailServiceImpl extends ServiceImpl&lt;CycleCountDetailMap
+
+
+
+
+
+    /**
+     * 执行任务修改状态为10
+     * @param detailid
+     */
+    @Transactional
+    @Override
+    public void updataDetailStatus(Integer detailid,Integer status) {
+        /*传入明细ID，状态，通过明细ID修改状态，并修改主单状态 */
+        if(detailid == null || status == null){
+            throw new ServiceException("明细ID或状态不能为空！");
+        }
+        CycleCountDetail cycleCountDetail = this.getById(detailid) ;//盘点明细单
+        cycleCountDetail.setEnableStatus(status);
+        cycleCountDetail.setLastUpdated(new Date());
+        cycleCountDetail.setLastUpdatedBy(ShiroUtils.getLoginName());//更新用户
+        //主单
+        CycleCountHeader cycleCountHeader = new CycleCountHeader();
+        cycleCountHeader.setCode(cycleCountDetail.getCycleCountHeadCode());
+        cycleCountHeader.setWarehouseCode(cycleCountDetail.getWarehouseCode());
+        cycleCountHeader.setCompanyCode(cycleCountDetail.getCompanyCode());
+        LambdaQueryWrapper<CycleCountHeader> lambdaQueryWrapper = Wrappers.lambdaQuery(cycleCountHeader);
+        cycleCountHeader = cycleCountHeaderService.getOne(lambdaQueryWrapper);
+        if(cycleCountHeader.getStatusCyc() < 10 ){
+            //主单状态小于10则修改
+            cycleCountHeader.setStatusCyc(status);  //主单状态
+            cycleCountHeaderService.saveOrUpdate(cycleCountHeader);
+        }
+        if(!this.saveOrUpdate(cycleCountDetail)){
+            throw new ServiceException("更新盘点执行状态失败！");
+        }
+    }
+
     /**
      * 新增盘点明细
      * */
@@ -118,7 +156,6 @@ public class CycleCountDetailServiceImpl extends ServiceImpl&lt;CycleCountDetailMap
         return AjaxResult.success("生成盘点明细成功");
     }
-
     /**
      * 生成全部盘点任务
      * @param cycleCountHeadCode
@@ -196,7 +233,6 @@ public class CycleCountDetailServiceImpl extends ServiceImpl&lt;CycleCountDetailMap
         }
         //查询任务头和明细有相同容器，没有就新增任务头和明细
-
         LambdaQueryWrapper<TaskHeader> taskHeaderLambdaQueryWrapper = Wrappers.lambdaQuery();
         taskHeaderLambdaQueryWrapper
                 .lt(TaskHeader::getStatus,100)
@@ -207,12 +243,9 @@ public class CycleCountDetailServiceImpl extends ServiceImpl&lt;CycleCountDetailMap
                 .eq(TaskHeader::getContainerCode,cycleCountDetail.getContainerCode());//容器
         List<TaskHeader> taskHeaderList = taskHeaderService.list(taskHeaderLambdaQueryWrapper);
-
         TaskHeader task = new TaskHeader();
         TaskDetail taskDetail = new TaskDetail();
-
         if(taskHeaderList.size() <= 0){
-
             //存在相同容器的主任务直接加入该条主任务的明细
             task.setWarehouseCode(ShiroUtils.getWarehouseCode());
             task.setCompanyCode(cycleCountDetail.getCompanyCode());
@@ -242,7 +275,6 @@ public class CycleCountDetailServiceImpl extends ServiceImpl&lt;CycleCountDetailMap
             taskDetail.setWarehouseCode(task.getWarehouseCode());
             cycleCountDetail.setTaskHeaderId(task.getId()); //盘点明细修改状态task数据源
         }else{
-
             //取其中一条主单即可
             TaskHeader taskHeader = taskHeaderList.get(0);
             taskDetail.setTaskId(taskHeader.getId());//主单ID
@@ -254,7 +286,6 @@ public class CycleCountDetailServiceImpl extends ServiceImpl&lt;CycleCountDetailMap
             taskDetail.setWarehouseCode(taskHeader.getWarehouseCode());
             cycleCountDetail.setTaskHeaderId(taskHeader.getId());//盘点明细修改状态taskHeader数据源
         }
-
         taskDetail.setBillCode(cycleCountDetail.getCycleCountHeadCode());
         taskDetail.setBillDetailId(cycleCountDetail.getId());
         taskDetail.setMaterialCode(cycleCountDetail.getMaterialCode());
@@ -273,7 +304,6 @@ public class CycleCountDetailServiceImpl extends ServiceImpl&lt;CycleCountDetailMap
         if(taskDetailService.save(taskDetail) == false){
             throw new ServiceException("盘点任务明细生成失败！");
             }
-
         //修改细单状态
         cycleCountDetail.setTaskHeaderId(taskDetail.getId());
         //cycleCountDetail.setTaskHeaderId(task.getId());
@@ -283,7 +313,6 @@ public class CycleCountDetailServiceImpl extends ServiceImpl&lt;CycleCountDetailMap
         cycleCountDetail.setTaskHeaderId(task.getId());
         cycleCountDetail.setTaskDetailId(taskDetail.getId());
         this.saveOrUpdate(cycleCountDetail);
-
         //修改主单状态
         CycleCountHeader cycleCountHeader = new CycleCountHeader();
         cycleCountHeader.setCode(cycleCountDetail.getCycleCountHeadCode());
@@ -296,6 +325,124 @@ public class CycleCountDetailServiceImpl extends ServiceImpl&lt;CycleCountDetailMap
         return AjaxResult.success("盘点任务生成成功");
     }
+    /**
+     * 实盘登记
+     * 登记完成后，修改状态为15
+     * @param detailId
+     * @param qty
+     * @return
+     */
+    @Transactional
+    @Override
+    public AjaxResult confirmGapQty(Integer detailId, BigDecimal qty) {
+        CycleCountDetail cyclecountDetail = this.getById(detailId); //明细单据
+        CycleCountHeader cycleCountHeader =new CycleCountHeader();
+        cycleCountHeader.setWarehouseCode(cyclecountDetail.getWarehouseCode());
+        cycleCountHeader.setCompanyCode(cyclecountDetail.getCompanyCode());
+        cycleCountHeader.setCode(cyclecountDetail.getCycleCountHeadCode());
+        LambdaQueryWrapper<CycleCountHeader> cycleCountHeaderLambdaQueryWrapper = Wrappers.lambdaQuery(cycleCountHeader);
+         cycleCountHeader = cycleCountHeaderService.getOne(cycleCountHeaderLambdaQueryWrapper); //主单
+        //任务执行后再实盘登记
+        if(cyclecountDetail.getEnableStatus() < 10){
+            return AjaxResult.error("盘点任务未执行不能登记数量！");
+        }
+        if(cyclecountDetail.getEnableStatus() == 100){
+            return AjaxResult.error("盘点任务完成后不能再登记数量！");
+        }
+        if(cycleCountHeader==null){
+            return AjaxResult.error("主单据不存在");
+        }
+        /*if(cyclecountDetail.getEnableStatus() == 10){
+            return AjaxResult.error("该条已调整，不能重复调整！");
+        }*/
+        if(qty.compareTo(new BigDecimal("0")) < 0){
+            return AjaxResult.error("实盘登记数不能小于0");
+        }
+        if(cyclecountDetail.getInventoryDetailId() != null){
+            InventoryDetail inventoryDetail = inventoryDetailService.getById(cyclecountDetail.getInventoryDetailId());
+            if (inventoryDetail == null) {
+                return AjaxResult.error("没有对应库存信息，请重建盘点单");
+            }
+            if(qty.compareTo(inventoryDetail.getTaskQty()) < 0){
+                return AjaxResult.error("登记数量不能小于任务分配数量");
+            }
+        }
+        cyclecountDetail.setCountedQty(qty);
+        cyclecountDetail.setGapQty(qty.subtract(cyclecountDetail.getSystemQty()));
+        cyclecountDetail.setEnableStatus(15);
+        cyclecountDetail.setLastUpdatedBy(ShiroUtils.getLoginName());
+        cyclecountDetail.setLastUpdated(new Date());
+        this.saveOrUpdate(cyclecountDetail);
+        //修改主单状态
+        cycleCountHeaderService.updataHeaderStatus(cycleCountHeader.getCode());
+
+        return AjaxResult.success("登记成功");
+    }
+
+
+    /**
+     * 差异复盘
+     * @param cycleCountHeaderCode
+     * @return
+     */
+    @Transactional
+    @Override
+    public AjaxResult createCyclecountWithGapQty(String cycleCountHeaderCode) {
+        /*找出实盘登记中数量有差异的，重新生成盘点单*/
+
+
+        CycleCountHeader cycleCountHeader = new CycleCountHeader();
+        cycleCountHeader.setWarehouseCode(ShiroUtils.getWarehouseCode());
+        cycleCountHeader.setCode(cycleCountHeaderCode);
+        LambdaQueryWrapper<CycleCountHeader> lambdaQueryWrapper = Wrappers.lambdaQuery(cycleCountHeader);
+        cycleCountHeader = cycleCountHeaderService.getOne(lambdaQueryWrapper);//主单
+        if(cycleCountHeader == null){
+            return AjaxResult.error("盘点单不存在");
+        }
+        //不能重复生成,使用盘点单编码查找sourceCode源盘点单号，已存在就是重复
+        CycleCountHeader cy = new CycleCountHeader();
+        cy.setSourceCode(cycleCountHeader.getCode());
+        cy.setWarehouseCode(cycleCountHeader.getWarehouseCode());
+        cy.setCompanyCode(cycleCountHeader.getCompanyCode());
+        LambdaQueryWrapper<CycleCountHeader> lam = Wrappers.lambdaQuery(cy);
+        CycleCountHeader countHeader = cycleCountHeaderService.getOne(lam);
+        if(countHeader != null){
+            return AjaxResult.error("该单据已生成复盘单，请勿重复生成！");
+        }
+        CycleCountDetail cycleCountDetail = new CycleCountDetail();
+        cycleCountDetail.setTaskHeaderId(cycleCountHeader.getId());
+        cycleCountDetail.setWarehouseCode(cycleCountHeader.getWarehouseCode());
+        cycleCountDetail.setCompanyCode(cycleCountHeader.getCompanyCode());
+        LambdaQueryWrapper<CycleCountDetail> cycleCountDetailLambdaQueryWrapper = Wrappers.lambdaQuery();
+        List<CycleCountDetail> cycleCountDetails = this.list(cycleCountDetailLambdaQueryWrapper);//明细
+        //生成复盘盘点主单
+        cycleCountHeader.setCode(cycleCountHeaderService.createCode());
+        cycleCountHeader.setRound(cycleCountHeader.getRound() + 1);//盘点轮次+1
+        cycleCountHeader.setCreated(new Date());
+        cycleCountHeader.setCreatedBy(ShiroUtils.getLoginName());
+        cycleCountHeader.setSourceCode(cycleCountHeaderCode);//源盘点单号
+        if(!cycleCountHeaderService.saveOrUpdate(cycleCountHeader)){
+            throw new ServiceException("复盘主单生成失败!");
+        }
+        //获取差异数量不为零的子单重新再生成盘点单
+        List<CycleCountDetail> cycleCountDetailList = new ArrayList<>();
+        for(CycleCountDetail item:cycleCountDetails){
+            //getGapQty不能为null默认值为0
+           int f = item.getGapQty().compareTo(BigDecimal.ZERO);
+            if(f > 0){
+                item.setCountedQty(null);
+                item.setGapQty(BigDecimal.ZERO);
+                item.setCreatedBy(ShiroUtils.getLoginName());
+                item.setCreated(new Date());
+                cycleCountDetailList.add(item);
+                }
+
+        }
+        if(!this.saveBatch(cycleCountDetailList)){
+            throw new ServiceException("复盘明细子单生成失败");
+        }
+        return AjaxResult.success("生成复盘单成功!");
+    }
@@ -312,10 +312,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
     }
     /**
-     * 下发WCS执行任务
-     */
-    /**
-     *
+     *下发WCS执行任务
      * 执行任务
      * */
     @Override
@@ -324,6 +321,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
         TaskHeader task = null;
         for (Integer taskId : taskIds) {
             task = taskHeaderService.getById(taskId);
+
             if (task.getStatus() > 9) {
                 return AjaxResult.error("任务" + taskId + "已经下发，请不要重复下发，操作中止");
             }
@@ -335,17 +333,25 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
             task.setLastUpdatedBy(ShiroUtils.getLoginName());
             taskHeaderService.saveOrUpdate(task);
             //修改任务明细状态
-            TaskDetail record = new TaskDetail();
-            record.setStatus(10);
-            record.setLastUpdated(new Date());
-            record.setLastUpdatedBy(ShiroUtils.getLoginName());
-            record.setProcessStamp("100");
-            taskDetailService.updateById(record);
-            LambdaUpdateWrapper<TaskDetail> lambdaUpdateWrapper = Wrappers.lambdaUpdate();
-            lambdaUpdateWrapper.eq(TaskDetail::getTaskId, task.getId());
-            if (!taskDetailService.update(record, lambdaUpdateWrapper)){
+            LambdaQueryWrapper<TaskDetail> lambdaWrapper = Wrappers.lambdaQuery();
+            lambdaWrapper.eq(TaskDetail::getTaskId, task.getId());
+            List<TaskDetail> taskDetailList = taskDetailService.list(lambdaWrapper);
+            List<TaskDetail> taskDetails = new ArrayList<>();
+            for (TaskDetail item:taskDetailList){
+                item.setStatus(10);
+                item.setLastUpdated(new Date());
+                item.setLastUpdatedBy(ShiroUtils.getLoginName());
+                item.setProcessStamp("100");
+                taskDetails.add(item);
+                //盘点执行修改盘点单据状态为10
+                if(task.getTaskType() == 700){
+                    cycleCountDetailService.updataDetailStatus(item.getBillDetailId(),10);
+                }
+            }
+            if (!taskDetailService.saveOrUpdateBatch(taskDetails)){
                 throw new ServiceException("更新任务明细失败");
             }
+
 //            //修改入库明细
 //            if (task.getInternalTaskType()==100){
 //                ReceiptDetail receiptDetail = receiptDetailService.queryflow(receiptDetailService.getById(record.getId()));
@@ -387,7 +393,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
         }
-        return AjaxResult.success("下发任务成功", task);
+        return AjaxResult.success("执行下发任务成功", task);
     }
     @Override
@@ -416,7 +422,6 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
      * 完成任务
      *
      * @param task
-     * @throws Exception
      */
     @Transactional
     public void completeTask(TaskHeader task) {
@@ -429,7 +434,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
 //            出库任务
             completeShipmentTask(task);
         }
-        // 900 出库查看,包过空托出库查看
+        // 900 出库查看,空托出库查看
         if ( task.getTaskType() == 900) {
             completeSeeOutTask(task);
         }
@@ -1004,10 +1009,6 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
     @Transactional
     public void completeEmptyIn(TaskHeader taskHeader) {
-        //解锁容器，更新库位
-        containerService.updateLocationCodeAndStatus(taskHeader.getContainerCode(),taskHeader.getToLocation(),"empty");
-        //解锁库位，更新容器
-        locationService.updateContainerCodeAndStatus(taskHeader.getToLocation(),taskHeader.getContainerCode(),"empty");
         //完成任务,修改主单和明细状态
         taskHeader.setStatus(100);
         taskHeader.setLastUpdatedBy(ShiroUtils.getLoginName());
@@ -1026,9 +1027,14 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
             item.setLastUpdated(new Date());   //更新时间
             taskDetailList.add(item);
         }
-        if (taskDetailService.saveOrUpdateBatch(taskDetailList) == false || taskHeaderService.saveOrUpdate(taskHeader) == false) {
+        if (taskDetailService.saveOrUpdateBatch(taskDetailList) == false ||
+                taskHeaderService.saveOrUpdate(taskHeader) == false) {
             throw new ServiceException("任务单据状态更新失败！");
         }
+        //解锁容器，更新库位
+        containerService.updateLocationCodeAndStatus(taskHeader.getContainerCode(),taskHeader.getToLocation(),"empty");
+        //解锁库位，更新容器
+        locationService.updateContainerCodeAndStatus(taskHeader.getToLocation(),taskHeader.getContainerCode(),"empty");
     }
@@ -1038,10 +1044,6 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
      */
     @Transactional
     public void completeEmptyOut(TaskHeader taskHeader) {
-        //更新货位
-        locationService.updateContainerCodeAndStatus(taskHeader.getFromLocation(), "", "empty");
-        //更新容器信息
-        containerService.updateLocationCodeAndStatus(taskHeader.getContainerCode(), "", "empty");
         taskHeader.setStatus(100);
         taskHeader.setLastUpdatedBy(ShiroUtils.getLoginName());
@@ -1063,6 +1065,11 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
         if (taskDetailService.saveOrUpdateBatch(taskDetailList) == false || taskHeaderService.saveOrUpdate(taskHeader) == false) {
             throw new ServiceException("任务单据状态更新失败！");
         }
+        //更新货位
+        locationService.updateContainerCodeAndStatus(taskHeader.getFromLocation(), "", "empty");
+        //更新容器信息
+        containerService.updateLocationCodeAndStatus(taskHeader.getContainerCode(), "", "empty");
+
     }
     /**
@@ -88,10 +88,10 @@
                shiro:hasPermission="inventory:cycleCountDetail:add">
                 <i class="fa fa-plus"></i> 新增
             </a>
-            <!--<a class="btn btn-outline btn-danger btn-rounded" onclick="createCyclecountWithGapQty()"
+            <a class="btn btn-outline btn-danger btn-rounded" onclick="createCyclecountWithGapQty()"
                shiro:hasPermission="inventory:cyclecountDetail:cyclecountRepeat">
                 <i class="fa fa-vcard"></i> 差异复盘
-            </a>-->
+            </a>
             <a class="btn btn-outline btn-danger btn-rounded" onclick="outcheckAll()"
                shiro:hasPermission="inventory:cyclecountDetail:createTask">
                 <i class="fa fa-vcard"></i> 生成全部盘点任务