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

pengcheng
2 parents 62104406 d1a00867
Showing 12 changed files with 67 additions and 52 deletions
src/main/java/com/huaheng/pc/inventory/cycleCountDetail/controller/CycleCountDetailController.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/domain/CycleCountHeader.java
src/main/java/com/huaheng/pc/inventory/cycleCountHeader/service/CycleCountHeaderServiceImpl.java
src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java
src/main/resources/mybatis/inventory/CycleCountHeaderMapper.xml
src/main/resources/static/file/物料.xls
src/main/resources/templates/inventory/cycleCountDetail/add.html
src/main/resources/templates/inventory/cycleCountDetail/cycleCountDetail.html
src/main/resources/templates/inventory/cycleCountHeader/add.html
src/main/resources/templates/inventory/cycleCountHeader/cycleCountHeader.html
@@ -77,7 +77,7 @@ public class CycleCountDetailController extends BaseController {
         PageDomain pageDomain = TableSupport.buildPageRequest();
         Integer pageNum = pageDomain.getPageNum();
         Integer pageSize = pageDomain.getPageSize();
-        //没有主单ID传入则直接返回空list
+        //没有主单Code传入则直接返回空list
         if(cycleCountDetail.getCycleCountHeadCode() != null){
         lambdaQueryWrapper.ge(
                 StringUtils.isNotEmpty(createdBegin), CycleCountDetail::getCreated, createdBegin)
@@ -121,17 +121,20 @@ public class CycleCountDetailController extends BaseController {
      * 新增盘点明细
      */
     @GetMapping("/add")
-    public String add(Integer cycleCountHeadId,String companyCode, ModelMap m)
+    public String add(String cycleCountHeadCode,String companyCode, ModelMap m)
     {
-        if(cycleCountHeadId == null){
+        if(cycleCountHeadCode == null){
             throw new SecurityException("盘点头ID不能为空！");
         }
         //相同货主才能盘点,取出盘点头的货主
-        CycleCountHeader cycleCountHeader = cycleCountHeaderService.getById(cycleCountHeadId);
+        CycleCountHeader cycleCountHeader = new CycleCountHeader();
+        cycleCountHeader.setCode(cycleCountHeadCode);
+        cycleCountHeader.setWarehouseCode(ShiroUtils.getWarehouseCode());
+        LambdaQueryWrapper<CycleCountHeader> lamd = Wrappers.lambdaQuery(cycleCountHeader);
+        cycleCountHeader = cycleCountHeaderService.getOne(lamd);
         companyCode = cycleCountHeader.getCompanyCode();
         m.put("companyCode",companyCode);
-        m.put("cycleCountHeadId",cycleCountHeadId);
-
+        m.put("cycleCountHeadCode",cycleCountHeadCode);
         return prefix + "/add";
     }
@@ -160,15 +163,16 @@ public class CycleCountDetailController extends BaseController {
             return AjaxResult.error("删除的明细id不能为空");
         Integer[] detailsIds = Convert.toIntArray(ids);
         CycleCountDetail cyclecountDetail = cycleCountDetailService.getById(detailsIds[0]);
-        String masterCode = cyclecountDetail.getCycleCountHeadCode();
         CycleCountHeader ch = new CycleCountHeader();
-        ch.setMasterCode(masterCode);
+        ch.setCode(cyclecountDetail.getCycleCountHeadCode());
+        ch.setWarehouseCode(cyclecountDetail.getWarehouseCode());
+        ch.setCompanyCode(cyclecountDetail.getCompanyCode());
         LambdaQueryWrapper<CycleCountHeader> la = Wrappers.lambdaQuery(ch);
         CycleCountHeader cyclecountHeader = cycleCountHeaderService.getOne(la);
-        if(cyclecountHeader==null){
+        if(cyclecountHeader == null){
             return AjaxResult.error("主单据不存在");
         }
-        if(cyclecountHeader.getStatusCyc() > 29){
+        if(cyclecountHeader.getStatusCyc() > 5){
             return AjaxResult.error("主单据状态不允许删除");
         }
         for (Integer id : detailsIds)
@@ -53,8 +53,11 @@ public class CycleCountDetailServiceImpl extends ServiceImpl&lt;CycleCountDetailMap
     @Transactional
     public AjaxResult addDetails(String cycleCountHeadCode, Integer[] inventoryDetailIdIds) {
+        if(cycleCountHeadCode == null){
+            throw new ServiceException("盘点主单编码不能为空！");
+        }
         CycleCountHeader cyclecountHeader =new CycleCountHeader();
-        cyclecountHeader.setMasterCode(cycleCountHeadCode);
+        cyclecountHeader.setCode(cycleCountHeadCode);
         LambdaQueryWrapper<CycleCountHeader> ch = Wrappers.lambdaQuery(cyclecountHeader);
         cyclecountHeader = cycleCountHeaderService.getOne(ch);
         //可能存在并发删除的情况
@@ -68,7 +71,7 @@ public class CycleCountDetailServiceImpl extends ServiceImpl&lt;CycleCountDetailMap
         CycleCountDetail cycleCountDetail = new CycleCountDetail();
         cycleCountDetail.setWarehouseCode(cyclecountHeader.getWarehouseCode());
         cycleCountDetail.setCompanyCode(cyclecountHeader.getCompanyCode());
-        cycleCountDetail.setCycleCountHeadCode(cyclecountHeader.getMasterCode());
+        cycleCountDetail.setCycleCountHeadCode(cyclecountHeader.getCode());
         LambdaQueryWrapper<CycleCountDetail> cycleCountDetailLambd = Wrappers.lambdaQuery(cycleCountDetail);
         List<CycleCountDetail> cyclecountDetailList = this.list(cycleCountDetailLambd);
         if(cyclecountDetailList == null){
@@ -84,7 +87,7 @@ public class CycleCountDetailServiceImpl extends ServiceImpl&lt;CycleCountDetailMap
             //写入盘点明细
             CycleCountDetail ccd = new CycleCountDetail();
-            ccd.setCycleCountHeadCode(cyclecountHeader.getMasterCode());
+            ccd.setCycleCountHeadCode(cyclecountHeader.getCode());
             ccd.setInventoryDetailId(inventoryDetailId);
             ccd.setWarehouseCode(inventoryDetail.getWarehouseCode());
             ccd.setCompanyCode(inventoryDetail.getCompanyCode());
@@ -125,14 +128,14 @@ public class CycleCountDetailServiceImpl extends ServiceImpl&lt;CycleCountDetailMap
     @Transactional
     public AjaxResult createCycleCountTaskByHeadId(String cycleCountHeadCode) {
         CycleCountHeader cyclecountHeader =new CycleCountHeader();
-        cyclecountHeader.setMasterCode(cycleCountHeadCode);
+        cyclecountHeader.setCode(cycleCountHeadCode);
         LambdaQueryWrapper<CycleCountHeader> cych = Wrappers.lambdaQuery(cyclecountHeader);
         cyclecountHeader = cycleCountHeaderService.getById(cych);
         if(cyclecountHeader == null){
             return AjaxResult.error("盘点单不存在");
         }
         CycleCountDetail temp = new CycleCountDetail();
-        temp.setCycleCountHeadCode(cyclecountHeader.getMasterCode());
+        temp.setCycleCountHeadCode(cyclecountHeader.getCode());
         temp.setWarehouseCode(cyclecountHeader.getWarehouseCode());
         temp.setCompanyCode(cyclecountHeader.getCompanyCode());
         LambdaQueryWrapper<CycleCountDetail> lambdaQueryWrapper = Wrappers.lambdaQuery(temp);
@@ -172,7 +175,7 @@ public class CycleCountDetailServiceImpl extends ServiceImpl&lt;CycleCountDetailMap
     @Override
     @Transactional
     public AjaxResult createCycleCoutTaskByDetailId(Integer cycleCoutdetailId) {
-        /*任务主表中存在库位，在盘点明细中生成任务时，不同的库位需要生成不同的主任务*/
+        /*任务主表中存在库位，在盘点明细中生成任务时，不同的库位生成不同的主任务*/
         CycleCountDetail cycleCountDetail = this.getById(cycleCoutdetailId);
@@ -245,7 +248,7 @@ public class CycleCountDetailServiceImpl extends ServiceImpl&lt;CycleCountDetailMap
         this.saveOrUpdate(cycleCountDetail);
         //修改主单状态
         CycleCountHeader cycleCountHeader = new CycleCountHeader();
-        cycleCountHeader.setMasterCode(cycleCountDetail.getCycleCountHeadCode());
+        cycleCountHeader.setCode(cycleCountDetail.getCycleCountHeadCode());
         cycleCountHeader.setWarehouseCode(cycleCountDetail.getWarehouseCode());
         cycleCountHeader.setCompanyCode(cycleCountDetail.getCompanyCode());
         LambdaQueryWrapper<CycleCountHeader> lamb = Wrappers.lambdaQuery(cycleCountHeader);
@@ -78,7 +78,7 @@ public class CycleCountHeaderController extends BaseController {
                 .eq(CycleCountHeader::getWarehouseCode, ShiroUtils.getWarehouseCode()) //仓库
                 .eq(StringUtils.isNotEmpty(cycleCountHeader.getSourceCode()),CycleCountHeader::getSourceCode,cycleCountHeader.getSourceCode())//源盘点单号
                 .eq(cycleCountHeader.getId() != null, CycleCountHeader::getId,cycleCountHeader.getId())//ID
-                .eq(StringUtils.isNotEmpty(cycleCountHeader.getMasterCode()),CycleCountHeader::getMasterCode, cycleCountHeader.getMasterCode())//盘点主表编号
+                .eq(StringUtils.isNotEmpty(cycleCountHeader.getCode()),CycleCountHeader::getCode, cycleCountHeader.getCode())//盘点主表编号
                 .eq(cycleCountHeader.getCountOrderId() != null, CycleCountHeader::getCountOrderId, cycleCountHeader.getCountOrderId())//原始盘点ID
                 .eq(cycleCountHeader.getStatusCyc() != null, CycleCountHeader::getStatusCyc, cycleCountHeader.getStatusCyc()) //盘点单状态
                 .eq(cycleCountHeader.getCountType() != null ,CycleCountHeader::getCountType, cycleCountHeader.getCountType())//盘点类型
@@ -119,7 +119,7 @@ public class CycleCountHeaderController extends BaseController {
         //cycleCountHeader.setRound(cycleCountHeader.getRound());//盘点轮次
         cycleCountHeader.setCreated(new Date());
         cycleCountHeader.setCreatedBy(ShiroUtils.getLoginName());
-        cycleCountHeader.setMasterCode(cycleCountHeaderService.createCode());
+        cycleCountHeader.setCode(cycleCountHeaderService.createCode());
         return toAjax(cycleCountHeaderService.save(cycleCountHeader));
     }
@@ -171,7 +171,7 @@ public class CycleCountHeaderController extends BaseController {
     /**
      *
-     * 生成差异调整单
+     * 生成调整单
      * */
     //@RequiresPermissions("inventory:cyclecountHead:addAdjust")
     @Log(title = "库存-盘点", operating = "新增盘点差异调整单", action = BusinessType.INSERT)
@@ -195,7 +195,7 @@ public class CycleCountHeaderController extends BaseController {
         mmap.put("cyclecountHeader", cyclecountHeader);
         CycleCountDetail condition = new CycleCountDetail();
-        condition.setCycleCountHeadCode(cyclecountHeader.getMasterCode());
+        condition.setCycleCountHeadCode(cyclecountHeader.getCode());
         condition.setWarehouseCode(ShiroUtils.getWarehouseCode());
         LambdaQueryWrapper lambda = Wrappers.lambdaQuery(condition);
         List<CycleCountDetail> details =  cycleCountDetailService.list(lambda);
@@ -36,9 +36,9 @@ public class CycleCountHeader implements Serializable {
     /**
      * 盘点主表编号
      */
-    @TableField(value = "masterCode")
+    @TableField(value = "code")
     @ApiModelProperty(value="盘点主表编号")
-    private String masterCode;
+    private String code;
     /**
      * 仓库编码
@@ -293,17 +293,17 @@ public class CycleCountHeader implements Serializable {
      *
      * @return masterCode - 盘点主表编号
      */
-    public String getMasterCode() {
-        return masterCode;
+    public String getCode() {
+        return code;
     }
     /**
      * 设置盘点主表编号
      *
-     * @param masterCode 盘点主表编号
+     * @param code 盘点主表编号
      */
-    public void setMasterCode(String masterCode) {
-        this.masterCode = masterCode;
+    public void setCode(String code) {
+        this.code = code;
     }
     /**
@@ -53,13 +53,13 @@ public class CycleCountHeaderServiceImpl extends ServiceImpl&lt;CycleCountHeaderMap
         //完成时在全部单据都完成后才能修改主单状态为完成
         CycleCountHeader cyclecountHeader = new CycleCountHeader();
-        cyclecountHeader.setMasterCode(cycleCountHeaderCode);
+        cyclecountHeader.setCode(cycleCountHeaderCode);
         cyclecountHeader.setWarehouseCode(ShiroUtils.getWarehouseCode());
         LambdaQueryWrapper<CycleCountHeader> lamb = Wrappers.lambdaQuery(cyclecountHeader);
         cyclecountHeader = this.getOne(lamb);
         CycleCountDetail temp = new CycleCountDetail();
-        temp.setCycleCountHeadCode(cyclecountHeader.getMasterCode());
+        temp.setCycleCountHeadCode(cyclecountHeader.getCode());
         temp.setWarehouseCode(cyclecountHeader.getWarehouseCode());
         temp.setCompanyCode(cyclecountHeader.getCompanyCode());
         LambdaQueryWrapper<CycleCountDetail> lam = Wrappers.lambdaQuery(temp);
@@ -144,12 +144,12 @@ public class CycleCountHeaderServiceImpl extends ServiceImpl&lt;CycleCountHeaderMap
             return AjaxResult.error("id为"+id.toString()+"的盘点单不存在出，操作中止");
         }
         if(cyclecountHeader.getStatusCyc() > 0){
-            return AjaxResult.error("盘点单："+cyclecountHeader.getMasterCode()+"非新建状态，无法删除，操作中止");
+            return AjaxResult.error("盘点单："+cyclecountHeader.getCode()+"非新建状态，无法删除，操作中止");
         }
         //批量删除子单据
         CycleCountDetail temp = new CycleCountDetail();
         temp.setWarehouseCode(ShiroUtils.getWarehouseCode());
-        temp.setCycleCountHeadCode(cyclecountHeader.getMasterCode());
+        temp.setCycleCountHeadCode(cyclecountHeader.getCode());
         LambdaQueryWrapper lm = Wrappers.lambdaQuery(temp);
         cycleCountDetailService.remove(lm);
         cycleCountHeaderMapper.deleteById(id);
@@ -179,7 +179,7 @@ public class CycleCountHeaderServiceImpl extends ServiceImpl&lt;CycleCountHeaderMap
         adjustHeader.setWarehouseCode(ShiroUtils.getWarehouseCode());//仓库
         adjustHeader.setCode(adjustHeaderService.createCode());//生成差异单号
         adjustHeader.setProblemType("盘点调整");
-        adjustHeader.setCycleCountCode(cyclecountHeader.getMasterCode());
+        adjustHeader.setCycleCountCode(cyclecountHeader.getCode());
         adjustHeader.setCompanyCode(cyclecountHeader.getCompanyCode());
         adjustHeader.setCreated(new Date());
         adjustHeader.setCreatedBy(ShiroUtils.getLoginName());
@@ -189,7 +189,7 @@ public class CycleCountHeaderServiceImpl extends ServiceImpl&lt;CycleCountHeaderMap
         //根据盘点单查询明细并写入调整单
         CycleCountDetail cycleCountDetail = new CycleCountDetail();
-        cycleCountDetail.setCycleCountHeadCode(cyclecountHeader.getMasterCode());
+        cycleCountDetail.setCycleCountHeadCode(cyclecountHeader.getCode());
         cycleCountDetail.setWarehouseCode(cyclecountHeader.getWarehouseCode());
         LambdaQueryWrapper lam = Wrappers.lambdaQuery(cycleCountDetail);
         List<CycleCountDetail> cycleCountDetailList = cycleCountDetailService.list(lam);
@@ -206,7 +206,7 @@ public class CycleCountHeaderServiceImpl extends ServiceImpl&lt;CycleCountHeaderMap
                 adjustDetail.setCompanyCode(adjustHeader.getCompanyCode());
                 adjustDetail.setLocationCode(item.getLocationCode());
                 adjustDetail.setContainerCode(item.getContainerCode());
-                adjustDetail.setCycleCountCode(cyclecountHeader.getMasterCode());
+                adjustDetail.setCycleCountCode(cyclecountHeader.getCode());
                 adjustDetail.setMaterialCode(item.getMaterialCode());
                 adjustDetail.setMaterialName(item.getMaterialName());
                 adjustDetail.setMaterialSpec(item.getMaterialSpec());
@@ -52,6 +52,8 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.*;
+import java.util.concurrent.CopyOnWriteArrayList;
+
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huaheng.pc.task.taskHeader.domain.TaskHeader;
 import com.huaheng.pc.task.taskHeader.mapper.TaskHeaderMapper;
@@ -922,7 +924,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
         taskDetail.setTaskId(taskHeader.getId());
         LambdaQueryWrapper lambdaQueryWrapper = Wrappers.lambdaQuery(taskDetail);
         List<TaskDetail> taskDetailList = taskDetailService.list(lambdaQueryWrapper);//查询子单
-        List<CycleCountDetail> cycleCountDetailList = new ArrayList<>();
+        List<CycleCountDetail> cycleCountDetailList = new CopyOnWriteArrayList<>();
         for (TaskDetail item : taskDetailList) {
             item.setStatus(100);
             item.setLastUpdatedBy(ShiroUtils.getLoginName()); //更新用户
@@ -6,7 +6,7 @@
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="countOrderId" jdbcType="INTEGER" property="countOrderId" />
     <result column="round" jdbcType="INTEGER" property="round" />
-    <result column="masterCode" jdbcType="VARCHAR" property="masterCode" />
+    <result column="masterCode" jdbcType="VARCHAR" property="code" />
     <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" />
     <result column="companyCode" jdbcType="VARCHAR" property="companyCode" />
     <result column="countType" jdbcType="VARCHAR" property="countType" />
@@ -36,14 +36,14 @@
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    id, countOrderId, round, masterCode, warehouseCode, companyCode, countType, statusCyc, 
+    id, countOrderId, round, code, warehouseCode, companyCode, countType, statusCyc,
     countAttribute, remark, totalLocs, totalItems, zoneCode, locationFilter, releasedBy, 
     releasedAt, closedBy, closedAt, created, createdBy, lastUpdated, lastUpdatedBy, version, 
     userDef1, userDef2, userDef3, verifyBy, sourceCode, uploadTime, uploadStatus
   </sql>
     <select id="getLastCode" resultType="java.lang.String">
-        SELECT masterCode FROM cycle_count_header ORDER BY id DESC LIMIT 1
+        SELECT code FROM cycle_count_header ORDER BY id DESC LIMIT 1
     </select>
-ÎïÁÏ	code
@@ -8,7 +8,7 @@
 	<div class="row">
 		<div class="col-sm-12 select-info">
 			<form id="inventory-form">
-                <input type="hidden" id="cycleCountHeadId" name="cycleCountHeadId" th:value="${cycleCountHeadId}">
+                <input type="hidden" id="cycleCountHeadCode" name="cycleCountHeadCode" th:value="${cycleCountHeadCode}">
 					<div class="select-list">
 						<ul>
                             <ul>
@@ -329,16 +329,16 @@
         rows.forEach(function (item) {
 			ids.push(item.id);
         });
-        addInner($('#cycleCountHeadId').val(),ids.join(','));
+        addInner($('#cycleCountHeadCode').val(),ids.join(','));
     }
-    function addInner(cycleCountHeadId,ids) {
+    function addInner(cycleCountHeadCode,ids) {
         $.ajax({
             cache : true,
             type : "post",
             url : prefix_cycleDetails + "/add",
             data:{
-                cycleCountHeadId:cycleCountHeadId,
+                cycleCountHeadCode:cycleCountHeadCode,
                 inventoryDetailIdIds:ids
             },
             async : false,
@@ -10,7 +10,7 @@
                 <ul>
                     <li>
                         <form id="cycleHeader-form">
-                            盘点主ID：<input type="text" id="cycleCountHeadCode" name="cycleCountHeadCode" readonly="readonly" />
+                            盘点主单编码：<input type="text" id="cycleCountHeadCode" name="cycleCountHeadCode" readonly="readonly" />
                         </form>
                     </li>
                     <li>
@@ -33,9 +33,12 @@
             <div class="form-group">
                 <label class="col-sm-3 control-label">货主：</label>
                 <div class="col-sm-8">
-                    <input id="companyCode" name="companyCode" class="form-control" type="text">
+                    <select id="companyCode" name="companyCode" class="form-control" th:with="list=${@companyService.getCode()}">
+                        <option th:each="item : ${list}" th:text="${item['name']}" th:value="${item['code']}" th:attr = " code = ${item['code']}"></option>
+                    </select>
                 </div>
             </div>
+
             <div class="form-group">
                 <label class="col-sm-3 control-label">总货位数：</label>
                 <div class="col-sm-8">
@@ -31,7 +31,7 @@
                                         源盘点单号：<input type="text" name="sourceCode"/>
                                     </li>
                                     <li>
-                                        盘点主表编号：<input type="text" name="masterCode"/>
+                                        盘点单编码：<input type="text" name="code"/>
                                     </li>
                                     <li>
                                         原始盘点ID：<input type="text" name="countOrderId"/>
@@ -108,9 +108,13 @@
             sortName: "created",
             sortOrder: "desc",
             search: false,
+
             // onDblClickRow: function (row) {
             //     showDetail(row.id,row.code);
             // },
+            onDblClickRow:function(row){
+                 detail(row.id,row.masterCode);
+            },
             columns: [{
                 checkbox: true
             },
@@ -120,8 +124,8 @@
                     sortable: true
                 },
                 {
-                    field: 'masterCode',
-                    title: '盘点单号'
+                    field: 'code',
+                    title: '盘点单编码'
                 },
                 {
                     field: 'warehouseCode',
@@ -288,10 +292,10 @@
         });
     });
-    function detail(id) {
+    function detail(id,code) {
         let url = ctx + "inventory/cycleCountDetail";
-        if (id) {
-            url = ctx + "inventory/cycleCountDetail?id=" + id;
+        if (code) {
+            url = ctx + "inventory/cycleCountDetail?cycleCountHeadCode=" + code;
         }
         $("#tabDetail").children().remove();
         $("#myTab li").removeClass("active");