wms / wms_xianyangming · Commits

Commit 5c94c4ed448b4e85ee82e976cfc9e42d89543c48

Authored by pengcheng
2 parents 62104406 d1a00867

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

Inline Side-by-side
Showing 12 changed files with 67 additions and 52 deletions
src/main/java/com/huaheng/pc/inventory/cycleCountDetail/controller/CycleCountDetailController.java
  View file @5c94c4e
... ... @@ -77,7 +77,7 @@ public class CycleCountDetailController extends BaseController {
77 77 PageDomain pageDomain = TableSupport.buildPageRequest();
78 78 Integer pageNum = pageDomain.getPageNum();
79 79 Integer pageSize = pageDomain.getPageSize();
80   - //没有主单ID传入则直接返回空list
  80 + //没有主单Code传入则直接返回空list
81 81 if(cycleCountDetail.getCycleCountHeadCode() != null){
82 82 lambdaQueryWrapper.ge(
83 83 StringUtils.isNotEmpty(createdBegin), CycleCountDetail::getCreated, createdBegin)
... ... @@ -121,17 +121,20 @@ public class CycleCountDetailController extends BaseController {
121 121 * 新增盘点明细
122 122 */
123 123 @GetMapping("/add")
124   - public String add(Integer cycleCountHeadId,String companyCode, ModelMap m)
  124 + public String add(String cycleCountHeadCode,String companyCode, ModelMap m)
125 125 {
126   - if(cycleCountHeadId == null){
  126 + if(cycleCountHeadCode == null){
127 127 throw new SecurityException("盘点头ID不能为空！");
128 128 }
129 129 //相同货主才能盘点,取出盘点头的货主
130   - CycleCountHeader cycleCountHeader = cycleCountHeaderService.getById(cycleCountHeadId);
  130 + CycleCountHeader cycleCountHeader = new CycleCountHeader();
  131 + cycleCountHeader.setCode(cycleCountHeadCode);
  132 + cycleCountHeader.setWarehouseCode(ShiroUtils.getWarehouseCode());
  133 + LambdaQueryWrapper<CycleCountHeader> lamd = Wrappers.lambdaQuery(cycleCountHeader);
  134 + cycleCountHeader = cycleCountHeaderService.getOne(lamd);
131 135 companyCode = cycleCountHeader.getCompanyCode();
132 136 m.put("companyCode",companyCode);
133   - m.put("cycleCountHeadId",cycleCountHeadId);
134   -
  137 + m.put("cycleCountHeadCode",cycleCountHeadCode);
135 138 return prefix + "/add";
136 139 }
137 140  
... ... @@ -160,15 +163,16 @@ public class CycleCountDetailController extends BaseController {
160 163 return AjaxResult.error("删除的明细id不能为空");
161 164 Integer[] detailsIds = Convert.toIntArray(ids);
162 165 CycleCountDetail cyclecountDetail = cycleCountDetailService.getById(detailsIds[0]);
163   - String masterCode = cyclecountDetail.getCycleCountHeadCode();
164 166 CycleCountHeader ch = new CycleCountHeader();
165   - ch.setMasterCode(masterCode);
  167 + ch.setCode(cyclecountDetail.getCycleCountHeadCode());
  168 + ch.setWarehouseCode(cyclecountDetail.getWarehouseCode());
  169 + ch.setCompanyCode(cyclecountDetail.getCompanyCode());
166 170 LambdaQueryWrapper<CycleCountHeader> la = Wrappers.lambdaQuery(ch);
167 171 CycleCountHeader cyclecountHeader = cycleCountHeaderService.getOne(la);
168   - if(cyclecountHeader==null){
  172 + if(cyclecountHeader == null){
169 173 return AjaxResult.error("主单据不存在");
170 174 }
171   - if(cyclecountHeader.getStatusCyc() > 29){
  175 + if(cyclecountHeader.getStatusCyc() > 5){
172 176 return AjaxResult.error("主单据状态不允许删除");
173 177 }
174 178 for (Integer id : detailsIds)
... ...
src/main/java/com/huaheng/pc/inventory/cycleCountDetail/service/CycleCountDetailServiceImpl.java
  View file @5c94c4e
... ... @@ -53,8 +53,11 @@ public class CycleCountDetailServiceImpl extends ServiceImpl&lt;CycleCountDetailMap
53 53 @Transactional
54 54 public AjaxResult addDetails(String cycleCountHeadCode, Integer[] inventoryDetailIdIds) {
55 55  
  56 + if(cycleCountHeadCode == null){
  57 + throw new ServiceException("盘点主单编码不能为空！");
  58 + }
56 59 CycleCountHeader cyclecountHeader =new CycleCountHeader();
57   - cyclecountHeader.setMasterCode(cycleCountHeadCode);
  60 + cyclecountHeader.setCode(cycleCountHeadCode);
58 61 LambdaQueryWrapper<CycleCountHeader> ch = Wrappers.lambdaQuery(cyclecountHeader);
59 62 cyclecountHeader = cycleCountHeaderService.getOne(ch);
60 63 //可能存在并发删除的情况
... ... @@ -68,7 +71,7 @@ public class CycleCountDetailServiceImpl extends ServiceImpl&lt;CycleCountDetailMap
68 71 CycleCountDetail cycleCountDetail = new CycleCountDetail();
69 72 cycleCountDetail.setWarehouseCode(cyclecountHeader.getWarehouseCode());
70 73 cycleCountDetail.setCompanyCode(cyclecountHeader.getCompanyCode());
71   - cycleCountDetail.setCycleCountHeadCode(cyclecountHeader.getMasterCode());
  74 + cycleCountDetail.setCycleCountHeadCode(cyclecountHeader.getCode());
72 75 LambdaQueryWrapper<CycleCountDetail> cycleCountDetailLambd = Wrappers.lambdaQuery(cycleCountDetail);
73 76 List<CycleCountDetail> cyclecountDetailList = this.list(cycleCountDetailLambd);
74 77 if(cyclecountDetailList == null){
... ... @@ -84,7 +87,7 @@ public class CycleCountDetailServiceImpl extends ServiceImpl&lt;CycleCountDetailMap
84 87  
85 88 //写入盘点明细
86 89 CycleCountDetail ccd = new CycleCountDetail();
87   - ccd.setCycleCountHeadCode(cyclecountHeader.getMasterCode());
  90 + ccd.setCycleCountHeadCode(cyclecountHeader.getCode());
88 91 ccd.setInventoryDetailId(inventoryDetailId);
89 92 ccd.setWarehouseCode(inventoryDetail.getWarehouseCode());
90 93 ccd.setCompanyCode(inventoryDetail.getCompanyCode());
... ... @@ -125,14 +128,14 @@ public class CycleCountDetailServiceImpl extends ServiceImpl&lt;CycleCountDetailMap
125 128 @Transactional
126 129 public AjaxResult createCycleCountTaskByHeadId(String cycleCountHeadCode) {
127 130 CycleCountHeader cyclecountHeader =new CycleCountHeader();
128   - cyclecountHeader.setMasterCode(cycleCountHeadCode);
  131 + cyclecountHeader.setCode(cycleCountHeadCode);
129 132 LambdaQueryWrapper<CycleCountHeader> cych = Wrappers.lambdaQuery(cyclecountHeader);
130 133 cyclecountHeader = cycleCountHeaderService.getById(cych);
131 134 if(cyclecountHeader == null){
132 135 return AjaxResult.error("盘点单不存在");
133 136 }
134 137 CycleCountDetail temp = new CycleCountDetail();
135   - temp.setCycleCountHeadCode(cyclecountHeader.getMasterCode());
  138 + temp.setCycleCountHeadCode(cyclecountHeader.getCode());
136 139 temp.setWarehouseCode(cyclecountHeader.getWarehouseCode());
137 140 temp.setCompanyCode(cyclecountHeader.getCompanyCode());
138 141 LambdaQueryWrapper<CycleCountDetail> lambdaQueryWrapper = Wrappers.lambdaQuery(temp);
... ... @@ -172,7 +175,7 @@ public class CycleCountDetailServiceImpl extends ServiceImpl&lt;CycleCountDetailMap
172 175 @Override
173 176 @Transactional
174 177 public AjaxResult createCycleCoutTaskByDetailId(Integer cycleCoutdetailId) {
175   - /*任务主表中存在库位，在盘点明细中生成任务时，不同的库位需要生成不同的主任务*/
  178 + /*任务主表中存在库位，在盘点明细中生成任务时，不同的库位生成不同的主任务*/
176 179  
177 180  
178 181 CycleCountDetail cycleCountDetail = this.getById(cycleCoutdetailId);
... ... @@ -245,7 +248,7 @@ public class CycleCountDetailServiceImpl extends ServiceImpl&lt;CycleCountDetailMap
245 248 this.saveOrUpdate(cycleCountDetail);
246 249 //修改主单状态
247 250 CycleCountHeader cycleCountHeader = new CycleCountHeader();
248   - cycleCountHeader.setMasterCode(cycleCountDetail.getCycleCountHeadCode());
  251 + cycleCountHeader.setCode(cycleCountDetail.getCycleCountHeadCode());
249 252 cycleCountHeader.setWarehouseCode(cycleCountDetail.getWarehouseCode());
250 253 cycleCountHeader.setCompanyCode(cycleCountDetail.getCompanyCode());
251 254 LambdaQueryWrapper<CycleCountHeader> lamb = Wrappers.lambdaQuery(cycleCountHeader);
... ...
src/main/java/com/huaheng/pc/inventory/cycleCountHeader/controller/CycleCountHeaderController.java
  View file @5c94c4e
... ... @@ -78,7 +78,7 @@ public class CycleCountHeaderController extends BaseController {
78 78 .eq(CycleCountHeader::getWarehouseCode, ShiroUtils.getWarehouseCode()) //仓库
79 79 .eq(StringUtils.isNotEmpty(cycleCountHeader.getSourceCode()),CycleCountHeader::getSourceCode,cycleCountHeader.getSourceCode())//源盘点单号
80 80 .eq(cycleCountHeader.getId() != null, CycleCountHeader::getId,cycleCountHeader.getId())//ID
81   - .eq(StringUtils.isNotEmpty(cycleCountHeader.getMasterCode()),CycleCountHeader::getMasterCode, cycleCountHeader.getMasterCode())//盘点主表编号
  81 + .eq(StringUtils.isNotEmpty(cycleCountHeader.getCode()),CycleCountHeader::getCode, cycleCountHeader.getCode())//盘点主表编号
82 82 .eq(cycleCountHeader.getCountOrderId() != null, CycleCountHeader::getCountOrderId, cycleCountHeader.getCountOrderId())//原始盘点ID
83 83 .eq(cycleCountHeader.getStatusCyc() != null, CycleCountHeader::getStatusCyc, cycleCountHeader.getStatusCyc()) //盘点单状态
84 84 .eq(cycleCountHeader.getCountType() != null ,CycleCountHeader::getCountType, cycleCountHeader.getCountType())//盘点类型
... ... @@ -119,7 +119,7 @@ public class CycleCountHeaderController extends BaseController {
119 119 //cycleCountHeader.setRound(cycleCountHeader.getRound());//盘点轮次
120 120 cycleCountHeader.setCreated(new Date());
121 121 cycleCountHeader.setCreatedBy(ShiroUtils.getLoginName());
122   - cycleCountHeader.setMasterCode(cycleCountHeaderService.createCode());
  122 + cycleCountHeader.setCode(cycleCountHeaderService.createCode());
123 123 return toAjax(cycleCountHeaderService.save(cycleCountHeader));
124 124 }
125 125  
... ... @@ -171,7 +171,7 @@ public class CycleCountHeaderController extends BaseController {
171 171  
172 172 /**
173 173 *
174   - * 生成差异调整单
  174 + * 生成调整单
175 175 * */
176 176 //@RequiresPermissions("inventory:cyclecountHead:addAdjust")
177 177 @Log(title = "库存-盘点", operating = "新增盘点差异调整单", action = BusinessType.INSERT)
... ... @@ -195,7 +195,7 @@ public class CycleCountHeaderController extends BaseController {
195 195 mmap.put("cyclecountHeader", cyclecountHeader);
196 196  
197 197 CycleCountDetail condition = new CycleCountDetail();
198   - condition.setCycleCountHeadCode(cyclecountHeader.getMasterCode());
  198 + condition.setCycleCountHeadCode(cyclecountHeader.getCode());
199 199 condition.setWarehouseCode(ShiroUtils.getWarehouseCode());
200 200 LambdaQueryWrapper lambda = Wrappers.lambdaQuery(condition);
201 201 List<CycleCountDetail> details = cycleCountDetailService.list(lambda);
... ...
src/main/java/com/huaheng/pc/inventory/cycleCountHeader/domain/CycleCountHeader.java
  View file @5c94c4e
... ... @@ -36,9 +36,9 @@ public class CycleCountHeader implements Serializable {
36 36 /**
37 37 * 盘点主表编号
38 38 */
39   - @TableField(value = "masterCode")
  39 + @TableField(value = "code")
40 40 @ApiModelProperty(value="盘点主表编号")
41   - private String masterCode;
  41 + private String code;
42 42  
43 43 /**
44 44 * 仓库编码
... ... @@ -293,17 +293,17 @@ public class CycleCountHeader implements Serializable {
293 293 *
294 294 * @return masterCode - 盘点主表编号
295 295 */
296   - public String getMasterCode() {
297   - return masterCode;
  296 + public String getCode() {
  297 + return code;
298 298 }
299 299  
300 300 /**
301 301 * 设置盘点主表编号
302 302 *
303   - * @param masterCode 盘点主表编号
  303 + * @param code 盘点主表编号
304 304 */
305   - public void setMasterCode(String masterCode) {
306   - this.masterCode = masterCode;
  305 + public void setCode(String code) {
  306 + this.code = code;
307 307 }
308 308  
309 309 /**
... ...
src/main/java/com/huaheng/pc/inventory/cycleCountHeader/service/CycleCountHeaderServiceImpl.java
  View file @5c94c4e
... ... @@ -53,13 +53,13 @@ public class CycleCountHeaderServiceImpl extends ServiceImpl&lt;CycleCountHeaderMap
53 53 //完成时在全部单据都完成后才能修改主单状态为完成
54 54  
55 55 CycleCountHeader cyclecountHeader = new CycleCountHeader();
56   - cyclecountHeader.setMasterCode(cycleCountHeaderCode);
  56 + cyclecountHeader.setCode(cycleCountHeaderCode);
57 57 cyclecountHeader.setWarehouseCode(ShiroUtils.getWarehouseCode());
58 58 LambdaQueryWrapper<CycleCountHeader> lamb = Wrappers.lambdaQuery(cyclecountHeader);
59 59 cyclecountHeader = this.getOne(lamb);
60 60  
61 61 CycleCountDetail temp = new CycleCountDetail();
62   - temp.setCycleCountHeadCode(cyclecountHeader.getMasterCode());
  62 + temp.setCycleCountHeadCode(cyclecountHeader.getCode());
63 63 temp.setWarehouseCode(cyclecountHeader.getWarehouseCode());
64 64 temp.setCompanyCode(cyclecountHeader.getCompanyCode());
65 65 LambdaQueryWrapper<CycleCountDetail> lam = Wrappers.lambdaQuery(temp);
... ... @@ -144,12 +144,12 @@ public class CycleCountHeaderServiceImpl extends ServiceImpl&lt;CycleCountHeaderMap
144 144 return AjaxResult.error("id为"+id.toString()+"的盘点单不存在出，操作中止");
145 145 }
146 146 if(cyclecountHeader.getStatusCyc() > 0){
147   - return AjaxResult.error("盘点单："+cyclecountHeader.getMasterCode()+"非新建状态，无法删除，操作中止");
  147 + return AjaxResult.error("盘点单："+cyclecountHeader.getCode()+"非新建状态，无法删除，操作中止");
148 148 }
149 149 //批量删除子单据
150 150 CycleCountDetail temp = new CycleCountDetail();
151 151 temp.setWarehouseCode(ShiroUtils.getWarehouseCode());
152   - temp.setCycleCountHeadCode(cyclecountHeader.getMasterCode());
  152 + temp.setCycleCountHeadCode(cyclecountHeader.getCode());
153 153 LambdaQueryWrapper lm = Wrappers.lambdaQuery(temp);
154 154 cycleCountDetailService.remove(lm);
155 155 cycleCountHeaderMapper.deleteById(id);
... ... @@ -179,7 +179,7 @@ public class CycleCountHeaderServiceImpl extends ServiceImpl&lt;CycleCountHeaderMap
179 179 adjustHeader.setWarehouseCode(ShiroUtils.getWarehouseCode());//仓库
180 180 adjustHeader.setCode(adjustHeaderService.createCode());//生成差异单号
181 181 adjustHeader.setProblemType("盘点调整");
182   - adjustHeader.setCycleCountCode(cyclecountHeader.getMasterCode());
  182 + adjustHeader.setCycleCountCode(cyclecountHeader.getCode());
183 183 adjustHeader.setCompanyCode(cyclecountHeader.getCompanyCode());
184 184 adjustHeader.setCreated(new Date());
185 185 adjustHeader.setCreatedBy(ShiroUtils.getLoginName());
... ... @@ -189,7 +189,7 @@ public class CycleCountHeaderServiceImpl extends ServiceImpl&lt;CycleCountHeaderMap
189 189  
190 190 //根据盘点单查询明细并写入调整单
191 191 CycleCountDetail cycleCountDetail = new CycleCountDetail();
192   - cycleCountDetail.setCycleCountHeadCode(cyclecountHeader.getMasterCode());
  192 + cycleCountDetail.setCycleCountHeadCode(cyclecountHeader.getCode());
193 193 cycleCountDetail.setWarehouseCode(cyclecountHeader.getWarehouseCode());
194 194 LambdaQueryWrapper lam = Wrappers.lambdaQuery(cycleCountDetail);
195 195 List<CycleCountDetail> cycleCountDetailList = cycleCountDetailService.list(lam);
... ... @@ -206,7 +206,7 @@ public class CycleCountHeaderServiceImpl extends ServiceImpl&lt;CycleCountHeaderMap
206 206 adjustDetail.setCompanyCode(adjustHeader.getCompanyCode());
207 207 adjustDetail.setLocationCode(item.getLocationCode());
208 208 adjustDetail.setContainerCode(item.getContainerCode());
209   - adjustDetail.setCycleCountCode(cyclecountHeader.getMasterCode());
  209 + adjustDetail.setCycleCountCode(cyclecountHeader.getCode());
210 210 adjustDetail.setMaterialCode(item.getMaterialCode());
211 211 adjustDetail.setMaterialName(item.getMaterialName());
212 212 adjustDetail.setMaterialSpec(item.getMaterialSpec());
... ...
src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java
  View file @5c94c4e
... ... @@ -52,6 +52,8 @@ import java.util.Date;
52 52 import java.util.List;
53 53 import java.util.Map;
54 54 import java.util.*;
  55 +import java.util.concurrent.CopyOnWriteArrayList;
  56 +
55 57 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
56 58 import com.huaheng.pc.task.taskHeader.domain.TaskHeader;
57 59 import com.huaheng.pc.task.taskHeader.mapper.TaskHeaderMapper;
... ... @@ -922,7 +924,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
922 924 taskDetail.setTaskId(taskHeader.getId());
923 925 LambdaQueryWrapper lambdaQueryWrapper = Wrappers.lambdaQuery(taskDetail);
924 926 List<TaskDetail> taskDetailList = taskDetailService.list(lambdaQueryWrapper);//查询子单
925   - List<CycleCountDetail> cycleCountDetailList = new ArrayList<>();
  927 + List<CycleCountDetail> cycleCountDetailList = new CopyOnWriteArrayList<>();
926 928 for (TaskDetail item : taskDetailList) {
927 929 item.setStatus(100);
928 930 item.setLastUpdatedBy(ShiroUtils.getLoginName()); //更新用户
... ...
src/main/resources/mybatis/inventory/CycleCountHeaderMapper.xml
  View file @5c94c4e
... ... @@ -6,7 +6,7 @@
6 6 <id column="id" jdbcType="INTEGER" property="id" />
7 7 <result column="countOrderId" jdbcType="INTEGER" property="countOrderId" />
8 8 <result column="round" jdbcType="INTEGER" property="round" />
9   - <result column="masterCode" jdbcType="VARCHAR" property="masterCode" />
  9 + <result column="masterCode" jdbcType="VARCHAR" property="code" />
10 10 <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" />
11 11 <result column="companyCode" jdbcType="VARCHAR" property="companyCode" />
12 12 <result column="countType" jdbcType="VARCHAR" property="countType" />
... ... @@ -36,14 +36,14 @@
36 36 </resultMap>
37 37 <sql id="Base_Column_List">
38 38 <!--@mbg.generated-->
39   - id, countOrderId, round, masterCode, warehouseCode, companyCode, countType, statusCyc,
  39 + id, countOrderId, round, code, warehouseCode, companyCode, countType, statusCyc,
40 40 countAttribute, remark, totalLocs, totalItems, zoneCode, locationFilter, releasedBy,
41 41 releasedAt, closedBy, closedAt, created, createdBy, lastUpdated, lastUpdatedBy, version,
42 42 userDef1, userDef2, userDef3, verifyBy, sourceCode, uploadTime, uploadStatus
43 43 </sql>
44 44  
45 45 <select id="getLastCode" resultType="java.lang.String">
46   - SELECT masterCode FROM cycle_count_header ORDER BY id DESC LIMIT 1
  46 + SELECT code FROM cycle_count_header ORDER BY id DESC LIMIT 1
47 47 </select>
48 48  
49 49  
... ...
src/main/resources/static/file/物料.xls deleted
View file @6210440
1   -ÎïÁÏ code
src/main/resources/templates/inventory/cycleCountDetail/add.html
  View file @5c94c4e
... ... @@ -8,7 +8,7 @@
8 8 <div class="row">
9 9 <div class="col-sm-12 select-info">
10 10 <form id="inventory-form">
11   - <input type="hidden" id="cycleCountHeadId" name="cycleCountHeadId" th:value="${cycleCountHeadId}">
  11 + <input type="hidden" id="cycleCountHeadCode" name="cycleCountHeadCode" th:value="${cycleCountHeadCode}">
12 12 <div class="select-list">
13 13 <ul>
14 14 <ul>
... ... @@ -329,16 +329,16 @@
329 329 rows.forEach(function (item) {
330 330 ids.push(item.id);
331 331 });
332   - addInner($('#cycleCountHeadId').val(),ids.join(','));
  332 + addInner($('#cycleCountHeadCode').val(),ids.join(','));
333 333 }
334 334  
335   - function addInner(cycleCountHeadId,ids) {
  335 + function addInner(cycleCountHeadCode,ids) {
336 336 $.ajax({
337 337 cache : true,
338 338 type : "post",
339 339 url : prefix_cycleDetails + "/add",
340 340 data:{
341   - cycleCountHeadId:cycleCountHeadId,
  341 + cycleCountHeadCode:cycleCountHeadCode,
342 342 inventoryDetailIdIds:ids
343 343 },
344 344 async : false,
... ...
src/main/resources/templates/inventory/cycleCountDetail/cycleCountDetail.html
  View file @5c94c4e
... ... @@ -10,7 +10,7 @@
10 10 <ul>
11 11 <li>
12 12 <form id="cycleHeader-form">
13   - 盘点主ID：<input type="text" id="cycleCountHeadCode" name="cycleCountHeadCode" readonly="readonly" />
  13 + 盘点主单编码：<input type="text" id="cycleCountHeadCode" name="cycleCountHeadCode" readonly="readonly" />
14 14 </form>
15 15 </li>
16 16 <li>
... ...
src/main/resources/templates/inventory/cycleCountHeader/add.html
  View file @5c94c4e
... ... @@ -33,9 +33,12 @@
33 33 <div class="form-group">
34 34 <label class="col-sm-3 control-label">货主：</label>
35 35 <div class="col-sm-8">
36   - <input id="companyCode" name="companyCode" class="form-control" type="text">
  36 + <select id="companyCode" name="companyCode" class="form-control" th:with="list=${@companyService.getCode()}">
  37 + <option th:each="item : ${list}" th:text="${item['name']}" th:value="${item['code']}" th:attr = " code = ${item['code']}"></option>
  38 + </select>
37 39 </div>
38 40 </div>
  41 +
39 42 <div class="form-group">
40 43 <label class="col-sm-3 control-label">总货位数：</label>
41 44 <div class="col-sm-8">
... ...
src/main/resources/templates/inventory/cycleCountHeader/cycleCountHeader.html
  View file @5c94c4e
... ... @@ -31,7 +31,7 @@
31 31 源盘点单号：<input type="text" name="sourceCode"/>
32 32 </li>
33 33 <li>
34   - 盘点主表编号：<input type="text" name="masterCode"/>
  34 + 盘点单编码：<input type="text" name="code"/>
35 35 </li>
36 36 <li>
37 37 原始盘点ID：<input type="text" name="countOrderId"/>
... ... @@ -108,9 +108,13 @@
108 108 sortName: "created",
109 109 sortOrder: "desc",
110 110 search: false,
  111 +
111 112 // onDblClickRow: function (row) {
112 113 // showDetail(row.id,row.code);
113 114 // },
  115 + onDblClickRow:function(row){
  116 + detail(row.id,row.masterCode);
  117 + },
114 118 columns: [{
115 119 checkbox: true
116 120 },
... ... @@ -120,8 +124,8 @@
120 124 sortable: true
121 125 },
122 126 {
123   - field: 'masterCode',
124   - title: '盘点单号'
  127 + field: 'code',
  128 + title: '盘点单编码'
125 129 },
126 130 {
127 131 field: 'warehouseCode',
... ... @@ -288,10 +292,10 @@
288 292 });
289 293 });
290 294  
291   - function detail(id) {
  295 + function detail(id,code) {
292 296 let url = ctx + "inventory/cycleCountDetail";
293   - if (id) {
294   - url = ctx + "inventory/cycleCountDetail?id=" + id;
  297 + if (code) {
  298 + url = ctx + "inventory/cycleCountDetail?cycleCountHeadCode=" + code;
295 299 }
296 300 $("#tabDetail").children().remove();
297 301 $("#myTab li").removeClass("active");
... ...