Merge branch 'develop' of http://172.16.29.40:8010/wms/wms2 into develop

pengcheng
2 parents 0acb3f07 4a4a19cc
Showing 12 changed files with 248 additions and 117 deletions
src/main/java/com/huaheng/pc/inventory/cycleCountDetail/controller/CycleCountDetailController.java
src/main/java/com/huaheng/pc/inventory/cycleCountDetail/domain/CycleCountDetail.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/inventory/cycleCountHeader/controller/CycleCountHeaderController.java
src/main/java/com/huaheng/pc/inventory/cycleCountHeader/service/CycleCountHeaderServiceImpl.java
src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java
src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java
src/main/resources/mybatis/inventory/CycleCountDetailMapper.xml
src/main/resources/templates/inventory/cycleCountDetail/add.html
src/main/resources/templates/inventory/cycleCountDetail/cycleCountDetail.html
src/main/resources/templates/task/taskHeader/taskHeader.html
@@ -78,12 +78,12 @@ public class CycleCountDetailController extends BaseController {
         Integer pageNum = pageDomain.getPageNum();
         Integer pageSize = pageDomain.getPageSize();
         //没有主单ID传入则直接返回空list
-        if(cycleCountDetail.getCycleCountHeadId() != null){
+        if(cycleCountDetail.getCycleCountHeadCode() != null){
         lambdaQueryWrapper.ge(
                 StringUtils.isNotEmpty(createdBegin), CycleCountDetail::getCreated, createdBegin)
                 .le(StringUtils.isNotEmpty(createdEnd), CycleCountDetail::getCreated, createdEnd)//创建时间范围
                 .eq(CycleCountDetail::getWarehouseCode, ShiroUtils.getWarehouseCode()) //仓库
-                .eq(cycleCountDetail.getCycleCountHeadId() != null ,CycleCountDetail::getCycleCountHeadId,cycleCountDetail.getCycleCountHeadId())//盘点主单
+                .eq(cycleCountDetail.getCycleCountHeadCode() != null ,CycleCountDetail::getCycleCountHeadCode,cycleCountDetail.getCycleCountHeadCode())//盘点主单
                 .eq(StringUtils.isNotEmpty(cycleCountDetail.getCompanyCode()),CycleCountDetail::getCompanyCode, cycleCountDetail.getCompanyCode())//货主
                 .eq(StringUtils.isNotEmpty(cycleCountDetail.getLocationCode()), CycleCountDetail::getLocationCode, cycleCountDetail.getLocationCode()) //库位
                 .eq(StringUtils.isNotEmpty(cycleCountDetail.getContainerCode()), CycleCountDetail::getContainerCode,cycleCountDetail.getContainerCode()) //容器
@@ -142,9 +142,9 @@ public class CycleCountDetailController extends BaseController {
     @Log(title = "库存-盘点", operating = "新增盘点补货明细", action = BusinessType.INSERT)
     @PostMapping("/add")
     @ResponseBody
-    public AjaxResult addSave(Integer cycleCountHeadId, Integer[] inventoryDetailIdIds)
+    public AjaxResult addSave(String cycleCountHeadCode, Integer[] inventoryDetailIdIds)
     {
-        return cycleCountDetailService.addDetails(cycleCountHeadId,inventoryDetailIdIds);
+        return cycleCountDetailService.addDetails(cycleCountHeadCode,inventoryDetailIdIds);
     }
     /**
@@ -160,7 +160,11 @@ public class CycleCountDetailController extends BaseController {
             return AjaxResult.error("删除的明细id不能为空");
         Integer[] detailsIds = Convert.toIntArray(ids);
         CycleCountDetail cyclecountDetail = cycleCountDetailService.getById(detailsIds[0]);
-        CycleCountHeader cyclecountHeader = cycleCountHeaderService.getById(cyclecountDetail.getCycleCountHeadId());
+        String masterCode = cyclecountDetail.getCycleCountHeadCode();
+        CycleCountHeader ch = new CycleCountHeader();
+        ch.setMasterCode(masterCode);
+        LambdaQueryWrapper<CycleCountHeader> la = Wrappers.lambdaQuery(ch);
+        CycleCountHeader cyclecountHeader = cycleCountHeaderService.getOne(la);
         if(cyclecountHeader==null){
             return AjaxResult.error("主单据不存在");
         }
@@ -183,11 +187,11 @@ public class CycleCountDetailController extends BaseController {
     //@RequiresPermissions("inventory:cyclecountDetail:createTask")
     @PostMapping("/createCycleCountTaskByHeadId")
     @ResponseBody
-    public AjaxResult createCycleCountTaskByHeadId(Integer cycleCountHeadId){
-        if(cycleCountHeadId ==null){
+    public AjaxResult createCycleCountTaskByHeadId(String cycleCountHeadCode){
+        if(cycleCountHeadCode ==null){
             return AjaxResult.error("生成盘点任务时盘点明细ID不能为空！");
         }
-        return cycleCountDetailService.createCycleCountTaskByHeadId(cycleCountHeadId);
+        return cycleCountDetailService.createCycleCountTaskByHeadId(cycleCountHeadCode);
     }
     /**生成单条盘点任务*/
@@ -283,9 +283,9 @@ public class CycleCountDetail implements Serializable {
     /**
      * 盘点主单号
      * */
-    @TableField(value = "cycleCountHeadId")
+    @TableField(value = "cycleCountHeadCode")
     @ApiModelProperty(value = "盘点主单号")
-    private Integer cycleCountHeadId;
+    private String cycleCountHeadCode;
@@ -947,11 +947,11 @@ public class CycleCountDetail implements Serializable {
         this.projectNo = projectNo;
     }
-    public Integer getCycleCountHeadId() {
-        return cycleCountHeadId;
+    public String getCycleCountHeadCode() {
+        return cycleCountHeadCode;
     }
-    public void setCycleCountHeadId(Integer cycleCountHeadId) {
-        this.cycleCountHeadId = cycleCountHeadId;
+    public void setCycleCountHeadCode(String cycleCountHeadCode) {
+        this.cycleCountHeadCode = cycleCountHeadCode;
     }
 }
 \ No newline at end of file
@@ -9,9 +9,9 @@ import com.huaheng.pc.inventory.cycleCountDetail.domain.CycleCountDetail;
 public interface CycleCountDetailService extends IService<CycleCountDetail> {
-    AjaxResult addDetails(Integer cycleCountHeadId, Integer[] inventoryDetailIdIds);
+    AjaxResult addDetails(String cycleCountHeadId, Integer[] inventoryDetailIdIds);
-    AjaxResult createCycleCountTaskByHeadId(Integer cycleCountHeadId);
+    AjaxResult createCycleCountTaskByHeadId(String cycleCountHeadCode);
     AjaxResult createCycleCoutTaskByDetailId(Integer cycleCoutdetailId);
@@ -53,9 +53,12 @@ public class CycleCountDetailServiceImpl extends ServiceImpl&lt;CycleCountDetailMap
      * */
     @Override
     @Transactional
-    public AjaxResult addDetails(Integer cycleCountHeadId, Integer[] inventoryDetailIdIds) {
+    public AjaxResult addDetails(String cycleCountHeadCode, Integer[] inventoryDetailIdIds) {
-        CycleCountHeader cyclecountHeader = cycleCountHeaderService.getById(cycleCountHeadId);
+        CycleCountHeader cyclecountHeader =new CycleCountHeader();
+        cyclecountHeader.setMasterCode(cycleCountHeadCode);
+        LambdaQueryWrapper<CycleCountHeader> ch = Wrappers.lambdaQuery(cyclecountHeader);
+        cyclecountHeader = cycleCountHeaderService.getOne(ch);
         //可能存在并发删除的情况
         if(cyclecountHeader==null){
             return AjaxResult.error("盘点主单据不存在");
@@ -67,7 +70,7 @@ public class CycleCountDetailServiceImpl extends ServiceImpl&lt;CycleCountDetailMap
         CycleCountDetail cycleCountDetail = new CycleCountDetail();
         cycleCountDetail.setWarehouseCode(cyclecountHeader.getWarehouseCode());
         cycleCountDetail.setCompanyCode(cyclecountHeader.getCompanyCode());
-        cycleCountDetail.setCycleCountHeadId(cycleCountHeadId);
+        cycleCountDetail.setCycleCountHeadCode(cyclecountHeader.getMasterCode());
         LambdaQueryWrapper<CycleCountDetail> cycleCountDetailLambd = Wrappers.lambdaQuery(cycleCountDetail);
         List<CycleCountDetail> cyclecountDetailList = this.list(cycleCountDetailLambd);
         if(cyclecountDetailList == null){
@@ -83,13 +86,13 @@ public class CycleCountDetailServiceImpl extends ServiceImpl&lt;CycleCountDetailMap
             //写入盘点明细
             CycleCountDetail ccd = new CycleCountDetail();
-            ccd.setCycleCountHeadId(cycleCountHeadId);
+            ccd.setCycleCountHeadCode(cyclecountHeader.getMasterCode());
             ccd.setInventoryDetailId(inventoryDetailId);
             ccd.setWarehouseCode(inventoryDetail.getWarehouseCode());
             ccd.setCompanyCode(inventoryDetail.getCompanyCode());
             ccd.setInventorySts(inventoryDetail.getInventorySts());
             ccd.setCountId(inventoryDetail.getId());
-            ccd.setEnableStatus(1);
+            ccd.setEnableStatus(5);
             ccd.setLocationCode(inventoryDetail.getLocationCode());
             ccd.setContainerCode(inventoryDetail.getContainerCode());
             ccd.setMaterialCode(inventoryDetail.getMaterialCode());
@@ -107,7 +110,9 @@ public class CycleCountDetailServiceImpl extends ServiceImpl&lt;CycleCountDetailMap
             ccd.setLastUpdated(new Date());
             ccd.setLastUpdatedBy(ShiroUtils.getLoginName());
             this.save(ccd);
-
+            //更新库存锁
+            inventoryDetail.setLockCode("cyclecount");
+            inventoryDetailService.saveOrUpdate(inventoryDetail);
         }
         return AjaxResult.success("生成盘点明细成功");
     }
@@ -115,19 +120,21 @@ public class CycleCountDetailServiceImpl extends ServiceImpl&lt;CycleCountDetailMap
     /**
      * 生成全部盘点任务
-     * @param cycleCountHeadId
+     * @param cycleCountHeadCode
      * @return
      */
     @Override
     @Transactional
-    public AjaxResult createCycleCountTaskByHeadId(Integer cycleCountHeadId) {
-
-        CycleCountHeader cyclecountHeader = cycleCountHeaderService.getById(cycleCountHeadId);
+    public AjaxResult createCycleCountTaskByHeadId(String cycleCountHeadCode) {
+        CycleCountHeader cyclecountHeader =new CycleCountHeader();
+        cyclecountHeader.setMasterCode(cycleCountHeadCode);
+        LambdaQueryWrapper<CycleCountHeader> cych = Wrappers.lambdaQuery(cyclecountHeader);
+        cyclecountHeader = cycleCountHeaderService.getById(cych);
         if(cyclecountHeader == null){
             return AjaxResult.error("盘点单不存在");
         }
         CycleCountDetail temp = new CycleCountDetail();
-        temp.setCycleCountHeadId(cycleCountHeadId);
+        temp.setCycleCountHeadCode(cyclecountHeader.getMasterCode());
         temp.setWarehouseCode(cyclecountHeader.getWarehouseCode());
         temp.setCompanyCode(cyclecountHeader.getCompanyCode());
         LambdaQueryWrapper<CycleCountDetail> lambdaQueryWrapper = Wrappers.lambdaQuery(temp);
@@ -139,7 +146,7 @@ public class CycleCountDetailServiceImpl extends ServiceImpl&lt;CycleCountDetailMap
         int count = 0;
         int countErr = 0;
         for(CycleCountDetail item:list){
-            if(item.getEnableStatus() < 1 && item.getTaskHeaderId() == null){
+            if(item.getEnableStatus() < 5 && item.getTaskHeaderId() == null){
                 AjaxResult result = this.createCycleCoutTaskByDetailId(item.getId());
                 if(result.getCode()==200){
                     count++;
@@ -184,11 +191,10 @@ public class CycleCountDetailServiceImpl extends ServiceImpl&lt;CycleCountDetailMap
             return AjaxResult.error(cycleCountDetail.getLocationCode()+"没有托盘，操作失败");
         }
         TaskHeader task = new TaskHeader();
-
         task.setWarehouseCode(ShiroUtils.getWarehouseCode());
         task.setCompanyCode(cycleCountDetail.getCompanyCode());
         task.setInternalTaskType(700);
-        task.setTaskType(900);
+        task.setTaskType(700);
         task.setContainerCode(cycleCountDetail.getContainerCode());
         task.setStatus(0);
         task.setFromLocation(cycleCountDetail.getLocationCode());
@@ -207,6 +213,16 @@ public class CycleCountDetailServiceImpl extends ServiceImpl&lt;CycleCountDetailMap
         TaskDetail taskDetail = new TaskDetail();
         taskDetail.setTaskId(task.getId());//主单ID
         taskDetail.setTaskType(task.getTaskType());
+        taskDetail.setBillCode(cycleCountDetail.getCycleCountHeadCode());
+        taskDetail.setBillDetailId(taskDetail.getId());
+        taskDetail.setMaterialCode(cycleCountDetail.getMaterialCode());
+        taskDetail.setMaterialName(cycleCountDetail.getMaterialName());
+        taskDetail.setMaterialSpec(cycleCountDetail.getMaterialSpec());
+        taskDetail.setMaterialUnit(cycleCountDetail.getMaterialUnit());
+        taskDetail.setBatch(cycleCountDetail.getBatch());
+        taskDetail.setFromInventoryId(cycleCountDetail.getInventoryDetailId());
+        taskDetail.setLot(cycleCountDetail.getLot());
+        taskDetail.setProjectNo(cycleCountDetail.getProjectNo());
         taskDetail.setInternalTaskType(task.getTaskType());
         taskDetail.setWarehouseCode(task.getWarehouseCode());
         taskDetail.setCompanyCode(cycleCountDetail.getCompanyCode());
@@ -225,7 +241,7 @@ public class CycleCountDetailServiceImpl extends ServiceImpl&lt;CycleCountDetailMap
         cycleCountDetail.setTaskHeaderId(task.getId());
         cycleCountDetail.setLastUpdated(new Date());
         cycleCountDetail.setLastUpdatedBy(ShiroUtils.getLoginName());
-        cycleCountDetail.setEnableStatus(1);
+        cycleCountDetail.setEnableStatus(5);
         this.saveOrUpdate(cycleCountDetail);
         return AjaxResult.success("盘点任务生成成功");
     }
@@ -195,7 +195,7 @@ public class CycleCountHeaderController extends BaseController {
         mmap.put("cyclecountHeader", cyclecountHeader);
         CycleCountDetail condition = new CycleCountDetail();
-        condition.setCycleCountHeadId(id);
+        condition.setCycleCountHeadCode(cyclecountHeader.getMasterCode());
         condition.setWarehouseCode(ShiroUtils.getWarehouseCode());
         LambdaQueryWrapper lambda = Wrappers.lambdaQuery(condition);
         List<CycleCountDetail> details =  cycleCountDetailService.list(lambda);
@@ -88,7 +88,7 @@ public class CycleCountHeaderServiceImpl extends ServiceImpl&lt;CycleCountHeaderMap
         //批量删除子单据
         CycleCountDetail temp = new CycleCountDetail();
         temp.setWarehouseCode(ShiroUtils.getWarehouseCode());
-        temp.setCycleCountHeadId(cyclecountHeader.getId());
+        temp.setCycleCountHeadCode(cyclecountHeader.getMasterCode());
         LambdaQueryWrapper lm = Wrappers.lambdaQuery(temp);
         cycleCountDetailService.remove(lm);
         cycleCountHeaderMapper.deleteById(id);
@@ -128,7 +128,7 @@ public class CycleCountHeaderServiceImpl extends ServiceImpl&lt;CycleCountHeaderMap
         //根据盘点单查询明细并写入调整单
         CycleCountDetail cycleCountDetail = new CycleCountDetail();
-        cycleCountDetail.setCycleCountHeadId(id);
+        cycleCountDetail.setCycleCountHeadCode(cyclecountHeader.getMasterCode());
         cycleCountDetail.setWarehouseCode(cyclecountHeader.getWarehouseCode());
         LambdaQueryWrapper lam = Wrappers.lambdaQuery(cycleCountDetail);
         List<CycleCountDetail> cycleCountDetailList = cycleCountDetailService.list(lam);
@@ -167,7 +167,6 @@ public class CycleCountHeaderServiceImpl extends ServiceImpl&lt;CycleCountHeaderMap
         }
         //修改盘点主单状态为已生成差异单
-
         cyclecountHeader.setStatusCyc(35);
         this.saveOrUpdate(cyclecountHeader);
@@ -38,10 +38,9 @@ public class InventoryDetailController extends BaseController
 {
     private String prefix = "inventory/inventoryDetail";
-	@Resource
-    private MaterialServiceImpl materialService;
-	@Resource
-	private InventoryHeaderService inventoryHeaderService;
+
+
+
     @Resource
 	private InventoryDetailService inventoryDetailService;
@@ -86,6 +85,7 @@ public class InventoryDetailController extends BaseController
                 .eq(inventoryDetail.getReceiptDetailId() != null,InventoryDetail::getReceiptDetailId,inventoryDetail.getReceiptDetailId()) // 入库单明细ID
                 .eq(StringUtils.isNotEmpty(inventoryDetail.getReferCode()),InventoryDetail::getReferCode,inventoryDetail.getReferCode())//上游单号
                 .eq(StringUtils.isNotEmpty(inventoryDetail.getReferDetailId()),InventoryDetail::getReferDetailId,inventoryDetail.getReferDetailId())//上游行号
+                .eq(StringUtils.isNotEmpty(inventoryDetail.getLockCode()),InventoryDetail::getLockCode,inventoryDetail.getLockCode())//库存锁
                 .orderByDesc(InventoryDetail::getId);
         if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
@@ -99,6 +99,54 @@ public class InventoryDetailController extends BaseController
         }
 	}
+    /**
+     * 盘点查询库存明细列表
+     */
+    //@RequiresPermissions("inventory:inventoryDetail:list")
+    @Log(title = "库存-盘点库存明细查看",operating = "盘点查看库存明细列表", action = BusinessType.GRANT)
+    @PostMapping("/inventoryCycleCountLook")
+    @ResponseBody
+    public TableDataInfo CycleCountLook(InventoryDetail inventoryDetail, String createdBegin, String createdEnd)
+    {
+        LambdaQueryWrapper<InventoryDetail> lambdaQueryWrapper = Wrappers.lambdaQuery();
+        PageDomain pageDomain = TableSupport.buildPageRequest();
+        Integer pageNum = pageDomain.getPageNum();
+        Integer pageSize = pageDomain.getPageSize();
+
+        lambdaQueryWrapper.ge(StringUtils.isNotEmpty(createdBegin),InventoryDetail::getCreated, createdBegin)
+                .le(StringUtils.isNotEmpty(createdEnd), InventoryDetail::getCreated, createdEnd)//创建时间范围
+                .eq(InventoryDetail::getWarehouseCode, ShiroUtils.getWarehouseCode())//仓库
+                .eq(inventoryDetail.getInventoryHeaderId() != null,InventoryDetail::getInventoryHeaderId,inventoryDetail.getInventoryHeaderId()) //ID
+                .eq(StringUtils.isNotEmpty(inventoryDetail.getLocationCode()),InventoryDetail::getLocationCode,inventoryDetail.getLocationCode()) //库位
+                .eq(StringUtils.isNotEmpty(inventoryDetail.getContainerCode()),InventoryDetail::getContainerCode,inventoryDetail.getContainerCode())//容器
+                .eq(StringUtils.isNotEmpty(inventoryDetail.getCompanyCode()),InventoryDetail::getCompanyCode,inventoryDetail.getCompanyCode())//货主
+                .eq(StringUtils.isNotEmpty(inventoryDetail.getSupplierCode()),InventoryDetail::getSupplierCode,inventoryDetail.getSupplierCode())//供应商
+                .eq(StringUtils.isNotEmpty(inventoryDetail.getMaterialCode()),InventoryDetail::getMaterialCode,inventoryDetail.getMaterialCode())//物料编码
+                .like(StringUtils.isNotEmpty(inventoryDetail.getMaterialName()),InventoryDetail::getMaterialName,inventoryDetail.getMaterialName())//物料名称
+                .like(StringUtils.isNotEmpty(inventoryDetail.getMaterialSpec()),InventoryDetail::getMaterialSpec,inventoryDetail.getMaterialSpec())//物料规格
+                .eq(StringUtils.isNotEmpty(inventoryDetail.getInventorySts()),InventoryDetail::getInventorySts,inventoryDetail.getInventorySts())//库存状态
+                .eq(StringUtils.isNotEmpty(inventoryDetail.getBatch()),InventoryDetail::getBatch,inventoryDetail.getBatch())//批次
+                .eq(StringUtils.isNotEmpty(inventoryDetail.getProjectNo()),InventoryDetail::getProjectNo,inventoryDetail.getProjectNo())//项目号
+                .eq(StringUtils.isNotEmpty(inventoryDetail.getLot()),InventoryDetail::getLot,inventoryDetail.getLot())//批号
+                .eq(StringUtils.isNotEmpty(inventoryDetail.getReceiptCode()),InventoryDetail::getReceiptCode,inventoryDetail.getReceiptCode())//入库单编码
+                .eq(inventoryDetail.getReceiptDetailId() != null,InventoryDetail::getReceiptDetailId,inventoryDetail.getReceiptDetailId()) // 入库单明细ID
+                .eq(StringUtils.isNotEmpty(inventoryDetail.getReferCode()),InventoryDetail::getReferCode,inventoryDetail.getReferCode())//上游单号
+                .eq(StringUtils.isNotEmpty(inventoryDetail.getReferDetailId()),InventoryDetail::getReferDetailId,inventoryDetail.getReferDetailId())//上游行号
+                //默认库存锁为空，当有盘点锁时不显示
+                .ne(InventoryDetail::getLockCode,"cyclecount")//库存锁 ,ne不等于
+                .orderByDesc(InventoryDetail::getId);
+
+        if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
+            //分页查询
+            Page<InventoryDetail> page = new Page<>(pageNum, pageSize);
+            IPage<InventoryDetail> iPage = inventoryDetailService.page(page, lambdaQueryWrapper);
+            return getMpDataTable(iPage.getRecords(),iPage.getTotal());
+        } else {
+            List<InventoryDetail> list = inventoryDetailService.list(lambdaQueryWrapper);
+            return getDataTable(list);
+        }
+    }
+
     /**库存明细出库查看*/
     //@RequiresPermissions("inventory:inventoryHeader:seeOut")
     @PostMapping("/detailcreateCheckOutTask")
@@ -12,6 +12,8 @@ import com.huaheng.pc.config.container.domain.Container;
 import com.huaheng.pc.config.container.service.ContainerService;
 import com.huaheng.pc.config.location.domain.Location;
 import com.huaheng.pc.config.location.service.LocationService;
+import com.huaheng.pc.inventory.cycleCountDetail.domain.CycleCountDetail;
+import com.huaheng.pc.inventory.cycleCountDetail.service.CycleCountDetailService;
 import com.huaheng.pc.inventory.cycleCountHeader.domain.CycleCountHeader;
 import com.huaheng.pc.inventory.inventoryDetail.domain.InventoryDetail;
 import com.huaheng.pc.inventory.inventoryDetail.service.InventoryDetailService;
@@ -38,6 +40,7 @@ import com.huaheng.pc.shipment.shipmentHeader.service.ShipmentHeaderService;
 import com.huaheng.pc.task.taskDetail.domain.TaskDetail;
 import com.huaheng.pc.task.taskDetail.service.TaskDetailService;
 import com.huaheng.pc.task.taskHeader.domain.ShipmentTaskCreateModel;
+import org.apache.poi.ss.formula.functions.T;
 import org.jsoup.helper.DataUtil;
 import org.springframework.stereotype.Service;
 import java.math.BigDecimal;
@@ -87,8 +90,8 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
     private ShipmentHeaderService shipmentHeaderService;
     @Resource
     private ShipmentDetailService shipmentDetailService;
-
-
+    @Resource
+    private CycleCountDetailService cycleCountDetailService;
     @Resource
     private ReceiptContainerHeaderService receiptContainerHeaderService;
     @Resource
@@ -104,11 +107,9 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
         return taskHeaderMapper.UncompleteCount(ContainerCode, ShiroUtils.getWarehouseCode());
     }
-
     /**
      * 取消任务
      * */
-
     @Override
     @Transactional
     public AjaxResult cancelTask(Integer[] taskIds) {
@@ -120,6 +121,17 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
             if(taskHeader.getStatus() > 9){
                 return AjaxResult.error("存在任务"+taskHeader.getId()+"已下发或执行，操作中止");
             }
+            //查出任务明细
+            TaskDetail taskDetail1 = new TaskDetail();
+            taskDetail1.setTaskId(taskHeader.getId());
+            taskDetail1.setWarehouseCode(taskHeader.getWarehouseCode());
+            taskDetail1.setCompanyCode(taskHeader.getCompanyCode());
+            LambdaQueryWrapper<TaskDetail> td = Wrappers.lambdaQuery(taskDetail1);
+            List<TaskDetail> taskDetailList = taskDetailService.list(td);
+            TaskDetail taskDetail = taskDetailList.get(0);
+            if(taskDetail == null){
+                throw new ServiceException("任务明细条目错误");
+            }
             //删除子任务
             LambdaQueryWrapper<TaskDetail> lambdaQueryWrapper = Wrappers.lambdaQuery();
             lambdaQueryWrapper.eq(TaskDetail::getTaskId,taskHeader.getId());
@@ -142,13 +154,28 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
                 shipmentContainerHeader.setStatus(0);
                 shipmentContainerHeaderService.updateById(shipmentContainerHeader);
             }
-//            if(taskHeader.getInternalTaskType() == 700)   {
-//                CycleCountHeader cycleCountHeader = new CycleCountHeader();
-//                cycleCountHeader.setId(task.getAllocationHeadId());
-//                cycleCountHeader.setLastUpdated(new Date());
-//                cycleCountHeader.setLastUpdatedBy(ShiroUtils.getLoginName());
-//                cyclecountDetailService.updateByModel(cyclecountDetail);
-//            }
+            //盘点取消任务，恢复明细状态为1
+            if(taskHeader.getInternalTaskType() == 700)   {
+
+                CycleCountDetail cycleCountDetail = new CycleCountDetail();
+                cycleCountDetail.setCompanyCode(taskDetail.getCompanyCode());
+                cycleCountDetail.setWarehouseCode(taskDetail.getWarehouseCode());
+                cycleCountDetail.setLocationCode(taskDetail.getFromLocation());
+                cycleCountDetail.setContainerCode(taskDetail.getContainerCode());
+                cycleCountDetail.setCycleCountHeadCode(taskDetail.getBillCode());//盘点单Code
+                cycleCountDetail.setId(taskDetail.getBillDetailId());//盘点细单ID
+                LambdaQueryWrapper<CycleCountDetail> lam = Wrappers.lambdaQuery(cycleCountDetail);
+                List<CycleCountDetail> cycleCountDetailList = cycleCountDetailService.list(lam);//
+                for(CycleCountDetail item:cycleCountDetailList){
+                    item.setTaskHeaderId(null);
+                    item.setTaskHeaderId(null);
+                    item.setLastUpdated(new Date());
+                    item.setLastUpdatedBy(ShiroUtils.getLoginName());
+                    item.setEnableStatus(1);
+                    cycleCountDetailService.saveOrUpdate(item);
+                }
+
+            }
             if(taskHeader.getInternalTaskType()==100||taskHeader.getInternalTaskType()==200){
                 if(taskHeader.getToLocation()!=null){
                     //更新托盘、库位状态
@@ -682,7 +709,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
      * @param task
      */
     @Transactional
-    private void completeTransferTask(TaskHeader task) {
+    public void completeTransferTask(TaskHeader task) {
         //找到任务明细
         TaskDetail taskDetail = new TaskDetail();
         taskDetail.setTaskId(task.getId());
@@ -899,13 +926,14 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
         if (taskDetailService.saveOrUpdateBatch(taskDetailList) == false || taskHeaderService.saveOrUpdate(taskHeader) == false) {
             throw new ServiceException("任务单据状态更新失败！");
         }
-        //盘点完成时，修改盘点详细中的状态为100，容器恢复为空
+        //盘点完成时，修改盘点详细中的状态为100，容器恢复为空，库存解锁
         if (taskHeader.getTaskType() == 700) {
             /*CyclecountDetail cyclecountDetai = cyclecountDetailService.selectEntityById(
                     task.getAllocationHeadId());
             cyclecountDetai.setStatus(40);
             cyclecountDetailService.updateByModel(cyclecountDetai);
             containerService.updateStatus(task.getContainerCode(),"empty");*/
+
         }
         //释放库位状态
         locationService.updateStatus(taskHeader.getFromLocation(), "empty");
@@ -1061,11 +1089,6 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
         return  AjaxResult.success("生成上架任务成功！");
     }
-
-
-
-
-
     /**
      *
      * 完成出库任务
@@ -1216,4 +1239,19 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
     }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }
@@ -4,6 +4,7 @@
   <resultMap id="BaseResultMap" type="com.huaheng.pc.inventory.cycleCountDetail.domain.CycleCountDetail">
     <!--@mbg.generated-->
     <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="cycleCountHeadCode" jdbcType="VARCHAR" property="cycleCountHeadCode" />
     <result column="countId" jdbcType="INTEGER" property="countId" />
     <result column="round" jdbcType="INTEGER" property="round" />
     <result column="taskHeaderId" jdbcType="INTEGER" property="taskHeaderId" />
@@ -44,7 +45,7 @@
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    id, countId, round, taskHeaderId, taskDetailId, warehouseCode, inventoryDetailId, 
+    id, countId, cycleCountHeadCode, round, taskHeaderId, taskDetailId, warehouseCode, inventoryDetailId,
     locationCode, containerCode, materialCode, materialName, materialSpec, materialUnit, 
     companyCode, inventorySts, systemQty, countedQty, gapQty, rejectionNote, countedBy,
     countedAt, assignedTo, assignedAt, completedBy, completedAt, enableStatus, created, 
@@ -11,45 +11,70 @@
                 <input type="hidden" id="cycleCountHeadId" name="cycleCountHeadId" th:value="${cycleCountHeadId}">
 					<div class="select-list">
 						<ul>
-                            <li>
-                                货主编码：<input type="text" id="companyCode" name="companyCode" th:value="${companyCode}" readonly="readonly"/>
-                            </li>
-							<li>
-								库位编码：<input type="text" id="locationCode" name="locationCode"/>
-							</li>
-							<li>
-								容器编号：<input type="text" id="containerCode" name="containerCode"/>
-							</li>
-							<li>
-								存货编码：<input type="text" id="materialCode" name="materialCode"/>
-							</li>
-							<li>
-								物料名称：<input type="text" id="materialName" name="materialName"/>
-							</li>
-							<!--<li>
-								物料规格：<input type="text" name="materialSpec"/>
-							</li>-->
+                            <ul>
+                                <li>
+                                    库存头ID：<input id="inventoryHeaderId" type="text" name="inventoryHeaderId"/>
+                                </li>
+                                <li>
+                                    库位编号：<input id="locationCode" type="text" name="locationCode"/>
+                                </li>
+                                <li>
+                                    容器编号：<input id="containerCode" type="text" name="containerCode"/>
+                                </li>
+                                <li>
+                                    物料编码：<input type="text" name="materialCode"/>
+                                </li>
+                                <li>
+                                    物料名称：<input type="text" name="materialName"/>
+                                </li>
+                                <li>
+                                    物料规格：<input type="text" name="materialSpec"/>
+                                </li>
+                                <li>
+                                    库存状态：
+                                    <select name="inventorySts" th:with="inventoryStatus=${@dict.getType('inventoryStatus')}">
+                                        <option value="">所有</option>
+                                        <option th:each="e : ${inventoryStatus}" th:text="${e['dictLabel']}"
+                                                th:value="${e['dictValue']}"></option>
+                                    </select>
+                                </li>
+                                <li>
+                                    供应商编码：<input type="text" name="supplierCode"/>
+                                </li>
+                                <li>
+                                    货主编码：<input type="text" name="companyCode"/>
+                                </li>
+                                <li>
+                                    上游单号：<input type="text" name="referCode"/>
+                                </li>
+                                <li>
+                                    上游行号：<input type="text" name="referDetailId"/>
+                                </li>
+                                <li>
+                                    入库编码：<input type="text" name="receiptCode"/>
+                                </li>
+                                <li>
+                                    入库明细ID：<input type="text" name="receiptDetailId"/>
+                                </li>
+                                <li>
+                                    项 目 号：<input type="text" name="projectNo"/>
+                                </li>
+                                <li>
+                                    批&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;次：<input type="text" name="batch"/>
+                                </li>
+                                <li>
+                                    批&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;号：<input type="text" name="lot"/>
+                                </li>
-							<li>
-								&nbsp;&nbsp;供 应 商：<input type="text" name="supplierCode"/>
-							</li>
-							<!--<li>
-								库存状态：
-								<select id="status" name="status" th:with="inventoryStatus=${@dict.getType('inventoryStatus')}">
-									<option value="">所有</option>
-									<option th:each="e : ${inventoryStatus}" th:text="${e['dictLabel']}" th:value="${e['dictValue']}"></option>
-								</select>
-							</li>-->
-							<li>
-								&nbsp;&nbsp;&nbsp;项 目 号：<input type="text" id="project" name="project"/>
-							</li>
-							<li class="time">
-								<label>创建时间： </label>
-								<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[createdBegin]"/>
-								<span>-</span>
-								<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[createdEnd]"/>
-							</li>
+                                <li class="time" style="height:30px">
+                                    <label>创建时间： </label>
+                                    <input type="text" class="time-input" id="startTime" placeholder="开始时间"
+                                           name="params[createdBegin]"/>
+                                    <span>-</span>
+                                    <input type="text" class="time-input" id="endTime" placeholder="结束时间"
+                                           name="params[createdEnd]"/>
+                                </li>
 							<li>
 								<a id="search" class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
 								<!--<a class="btn btn-success btn-rounded btn-sm" onclick="$.table.exportExcel()" shiro:hasPermission="general:inventoryHeader:export"><i class="fa fa-download"></i>&nbsp;导出</a>-->
@@ -76,7 +101,7 @@
     var inventoryStatus=[[${@dict.getType('inventoryStatus')}]];
     $(function() {
         $("#bootstrap-table").bootstrapTable({
-            url: prefix + "/inventoryDetailLook",
+            url: prefix + "/inventoryCycleCountLook",
             method:"post",
             contentType: "application/x-www-form-urlencoded",
             cache: false,                                       // 是否使用缓存
@@ -323,7 +348,7 @@
             success : function(data) {
                 if(data.code=="200"){
                     $.modal.alertSuccess("成功");
-                    parent.update();
+                    parent.$.table.refresh();
                 }else{
                     $.modal.alertError(data.msg)
                 }
@@ -10,7 +10,7 @@
                 <ul>
                     <li>
                         <form id="cycleHeader-form">
-                            盘点主ID：<input type="text" id="cycleCountHeadId" name="cycleCountHeadId" readonly="readonly" />
+                            盘点主ID：<input type="text" id="cycleCountHeadCode" name="cycleCountHeadCode" readonly="readonly" />
                         </form>
                     </li>
                     <li>
@@ -88,17 +88,17 @@
                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> 生成全部盘点任务
             </a>
             <a class="btn btn-outline btn-danger btn-rounded" onclick="batRemove()"
                shiro:hasPermission="inventory:cyclecountDetail:remove">
-                <i class="fa fa-trash-o"></i> 删除
+                <i class="fa fa-trash-o"></i> 批量删除
             </a>
             <a class="btn btn-outline btn-success btn-rounded" onclick="$.table.refresh()">
                 <i class="fa fa-refresh"></i> 刷新
@@ -147,8 +147,8 @@
                     sortable:true
                 },
                 {
-                    field: 'cycleCountHeadId',
-                    title: '盘点主单ID',
+                    field: 'cycleCountHeadCode',
+                    title: '盘点主单编码',
                 },
                 {
                     field: 'warehouseCode',
@@ -330,11 +330,11 @@
         },url = location.search; //获取url中"?"符后的字串
         if (url.indexOf("?") != -1) {    //判断是否有参数
             let strs = url.substr(1).split("=");
-            $("#cycleCountHeadId").val(strs[1]);
+            $("#cycleCountHeadCode").val(strs[1]);
             options.queryParams=function(params) {
                 return {
                     // 传递参数查询参数
-                    cycleCountHeadId:strs[1],
+                    cycleCountHeadCode:strs[1],
                     pageSize:       params.limit,
                     pageNum:        params.offset / params.limit + 1,
                     searchValue:    params.search,
@@ -349,10 +349,10 @@
         }
     }
     function add() {
-        var cycleCountHeadId = $('#cycleCountHeadId').val();
-        var companyCode = $('#companyCode').val();
-        if(cycleCountHeadId !=null && cycleCountHeadId!="" && cycleCountHeadId!=undefined){
-            open("添加盘点明细", prefix+"/add?cycleCountHeadId=" + cycleCountHeadId);
+        var cycleCountHeadCode = $('#cycleCountHeadCode').val();
+        //var companyCode = $('#companyCode').val();
+        if(cycleCountHeadCode !=null && cycleCountHeadCode!="" && cycleCountHeadCode!=undefined){
+            open("添加盘点明细", prefix+"/add?cycleCountHeadCode=" + cycleCountHeadCode);
         }
     }
     function remove(id) {
@@ -538,7 +538,7 @@
     function comfirmAllWithNoGapQty() {
         $.modal.confirm("确认全部无差异登记么？注意这会覆盖先前登记的信息。", function() {
             var url = prefix + "/comfirmAllWithNoGapQty";
-            var data = { "cycleCountHeadId": $('#cycleCountHeadId').val() };
+            var data = { "cycleCountHeadCode": $('#cycleCountHeadCode').val() };
             postInner(url, data);
         });
     }
@@ -549,7 +549,7 @@
 /*    function comfirmRemainWithNoGapQty() {
         $.modal.confirm("确认剩余无差异登记么？", function() {
             var url = prefix + "/comfirmRemainWithNoGapQty";
-            var data = { "cycleCountHeadId": $('#cycleCountHeadId').val() };
+            var data = { "cycleCountHeadCode": $('#cycleCountHeadCode').val() };
             postInner(url, data);
         });
     }*/
@@ -560,7 +560,7 @@
     function createCyclecountWithGapQty() {
         $.modal.confirm("确认进行差异复盘么？该操作会将有差异的明细重新生成一个新的盘点单。", function() {
             var url = prefix + "/createCyclecountWithGapQty";
-            var data = { "cycleCountHeadId": $('#cycleCountHeadId').val() };
+            var data = { "cycleCountHeadCode": $('#cycleCountHeadCode').val() };
             postInner(url, data);
         });
     }
@@ -569,7 +569,7 @@
    /* function adjust() {
         $.modal.confirm("注意：该操作将更改库存，当实盘数量为0且库位上只剩空容器时，请手动执行空托出库任务,容器上有货则无需其他操作！", function() {
             var url = prefix + "/adjust";
-            var data = { "cycleCountHeadId": $('#cycleCountHeadId').val() };
+            var data = { "cycleCountHeadCode": $('#cycleCountHeadCode').val() };
             postInner(url,data);
         });
     }*/
@@ -603,7 +603,7 @@
     function outcheckAll() {
         $.modal.confirm("确认进行盘点任务生成么？注意，这将会使未生成盘点任务的明细生成盘点任务！", function() {
             var url = prefix + "/createCycleCountTaskByHeadId";
-            var data = { "cycleCountHeadId": $('#cycleCountHeadId').val() };
+            var data = { "cycleCountHeadCode": $('#cycleCountHeadCode').val() };
             postInner(url,data);
         });
     }
@@ -156,9 +156,9 @@
                     sortable: true
 				},
 				{
-					field : 'companyId', 
-					title : '货主id' ,
-					visible:false
+					field : 'companyCode',
+					title : '货主编码',
+					visible:true
 				},
 				{
 					field : 'taskType',