wms / wms_zhuzhouhangfa · Commits

Commit 3ac7e3189f86a2a4d4a418723762233d0e30f420

Authored by pengcheng
2 parents 95dcf402 7da89c74

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

Inline Side-by-side
Showing 30 changed files with 130 additions and 99 deletions
src/main/java/com/huaheng/pc/config/table/service/TableService.java 0 → 100644
  View file @3ac7e31
  1 +package com.huaheng.pc.config.table.service;
  2 +
  3 +import org.springframework.stereotype.Service;
  4 +
  5 +/**
  6 + * Created by Enzo Cotter on 2019/11/25.
  7 + */
  8 +@Service("table")
  9 +public class TableService {
  10 +
  11 + public boolean getVisible(String value){
  12 + if ("t".equals(value)){
  13 + return true;
  14 + } else {
  15 + return false;
  16 + }
  17 + }
  18 +}
... ...
src/main/java/com/huaheng/pc/receipt/receiptHeader/controller/ReceiptHeaderController.java
  View file @3ac7e31
... ... @@ -79,9 +79,9 @@ public class ReceiptHeaderController extends BaseController {
79 79 .eq(StringUtils.isNotEmpty(receiptHeader.getReceiptType()),
80 80 ReceiptHeader::getReceiptType, receiptHeader.getReceiptType())
81 81 .eq(StringUtils.isNotEmpty(receiptHeader.getCode()), ReceiptHeader::getCode, receiptHeader.getCode())
82   - .eq(StringUtils.isNotNull(receiptHeader.getFirstStatus()),
  82 + .ge(StringUtils.isNotNull(receiptHeader.getFirstStatus()),
83 83 ReceiptHeader::getFirstStatus, receiptHeader.getFirstStatus())
84   - .eq(StringUtils.isNotNull(receiptHeader.getLastStatus()),
  84 + .le(StringUtils.isNotNull(receiptHeader.getLastStatus()),
85 85 ReceiptHeader::getLastStatus, receiptHeader.getLastStatus())
86 86 .orderByDesc(ReceiptHeader::getCreated);
87 87  
... ... @@ -195,7 +195,7 @@ public class ReceiptHeaderController extends BaseController {
195 195 @Log(title = "入库-入库单 ",operating = "入库单删除", action = BusinessType.UPDATE)
196 196 @PostMapping("/remove")
197 197 @ResponseBody
198   - public AjaxResult remove(@ApiParam(name = "id", value = "入库头表id字符串")Integer ids){
  198 + public AjaxResult remove(@ApiParam(name = "id", value = "入库头表id字符串")String ids){
199 199 if (StringUtils.isNull(ids)){
200 200 return AjaxResult.error("id为空");
201 201 }
... ...
src/main/java/com/huaheng/pc/receipt/receiptHeader/service/ReceiptHeaderService.java
  View file @3ac7e31
... ... @@ -219,6 +219,7 @@ public class ReceiptHeaderService extends ServiceImpl<ReceiptHeaderMapper, Recei
219 219 /**
220 220 * 提交审核入库单
221 221 */
  222 + @Transactional
222 223 public AjaxResult submitReview(String ids){
223 224 if (StringUtils.isEmpty(ids)){
224 225 return AjaxResult.error("id不能为空");
... ... @@ -229,12 +230,16 @@ public class ReceiptHeaderService extends ServiceImpl<ReceiptHeaderMapper, Recei
229 230 if (receiptHeader.getFirstStatus()>QuantityConstant.RECEIPT_HEADER_MODERATED ||receiptHeader.getLastStatus()>QuantityConstant.RECEIPT_HEADER_MODERATED){
230 231 return AjaxResult.error("单据号为"+receiptHeader.getCode()+"入库单不需要审核");
231 232 }
  233 + LambdaQueryWrapper<ReceiptDetail> lambdaQueryWrapper = Wrappers.lambdaQuery();
  234 + lambdaQueryWrapper.eq(ReceiptDetail::getReceiptId, idArray[i]);
  235 + List<ReceiptDetail> receiptDetailList = receiptDetailService.list(lambdaQueryWrapper);
  236 + if (receiptDetailList.isEmpty()){
  237 + return AjaxResult.error("单据号为"+receiptHeader.getCode()+"入库单没有明细");
  238 + }
232 239 receiptHeader.setFirstStatus(QuantityConstant.RECEIPT_HEADER_MODERATED);
233 240 receiptHeader.setLastStatus(QuantityConstant.RECEIPT_HEADER_MODERATED);
234 241 if (!this.updateById(receiptHeader)){
235 242 throw new ServiceException("更新入库头表失败");
236   - } else {
237   - return AjaxResult.success("提交审核成功，请等待审核");
238 243 }
239 244 }
240 245 return AjaxResult.success("提交审核成功");
... ...
src/main/java/com/huaheng/pc/receipt/receiptHeaderHistory/service/ReceiptHeaderHistoryService.java
  View file @3ac7e31
... ... @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
4 4 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
5 5 import com.huaheng.common.constant.QuantityConstant;
6 6 import com.huaheng.common.exception.service.ServiceException;
  7 +import com.huaheng.common.support.Convert;
7 8 import com.huaheng.common.utils.security.ShiroUtils;
8 9 import com.huaheng.framework.web.domain.AjaxResult;
9 10 import com.huaheng.pc.receipt.receiptDetail.domain.ReceiptDetail;
... ... @@ -18,6 +19,7 @@ import javax.annotation.Resource;
18 19 import java.lang.reflect.InvocationTargetException;
19 20 import java.util.ArrayList;
20 21  
  22 +import java.util.Arrays;
21 23 import java.util.List;
22 24 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
23 25 import com.huaheng.pc.receipt.receiptHeaderHistory.domain.ReceiptHeaderHistory;
... ... @@ -35,51 +37,57 @@ public class ReceiptHeaderHistoryService extends ServiceImpl&lt;ReceiptHeaderHistor
35 37 private ReceiptDetailHistoryService receiptDetailHistoryService;
36 38  
37 39 @Transactional
38   - public AjaxResult add(Integer id){
39   - ReceiptHeader receiptHeader = receiptHeaderService.getById(id);
40   - if (receiptHeader == null) return AjaxResult.success("");
41   - if((receiptHeader.getFirstStatus()>= QuantityConstant.RECEIPT_HEADER_POSTING && receiptHeader.getLastStatus()>=QuantityConstant.RECEIPT_HEADER_POSTING)||
42   - (receiptHeader.getFirstStatus()<QuantityConstant.RECEIPT_HEADER_POOL &receiptHeader.getLastStatus()<QuantityConstant.RECEIPT_HEADER_POOL)){
43   - ReceiptHeaderHistory receiptHeaderHistory = new ReceiptHeaderHistory();
44   - List<ReceiptDetailHistory> receiptDetailHistoryList = new ArrayList<>();
45   - //查询入库单明细
46   - LambdaQueryWrapper<ReceiptDetail> lambdaQueryWrapper = Wrappers.lambdaQuery();
47   - lambdaQueryWrapper.eq(ReceiptDetail::getReceiptId, id);
48   - List<ReceiptDetail> list = receiptDetailService.list(lambdaQueryWrapper);
49   - try {
50   - //复制到入库历史实体
51   - BeanUtils.copyProperties(receiptHeaderHistory, receiptHeader);
52   - for (ReceiptDetail receiptDetail: list) {
53   - ReceiptDetailHistory receiptDetailHistory = new ReceiptDetailHistory();
54   - BeanUtils.copyProperties(receiptDetailHistory, receiptDetail);
55   - receiptDetailHistoryList.add(receiptDetailHistory);
56   - }
57   - } catch (IllegalAccessException e) {
58   - e.printStackTrace();
59   - } catch (InvocationTargetException e) {
60   - e.printStackTrace();
61   - }
62   -
63   - receiptHeaderHistory.setLastUpdatedBy(ShiroUtils.getLoginName());
64   - if (!receiptHeaderService.removeById(receiptHeader.getId())){
65   - throw new ServiceException("删除头表失败");
  40 + public AjaxResult add(String ids){
  41 + List<Integer> idList = Arrays.asList(Convert.toIntArray(ids));
  42 + for (Integer id : idList) {
  43 + ReceiptHeader receiptHeader = receiptHeaderService.getById(id);
  44 + if (receiptHeader == null) {
  45 + return AjaxResult.success("");
66 46 }
67   - // 当存在明细时删除
68   - if (list.size()!= 0){
69   - //删除入库明细
70   - List<Integer> ids = new ArrayList<>();
71   - for (int i=0; i<receiptDetailHistoryList.size();i++){
72   - receiptDetailHistoryList.get(i).setLastUpdatedBy(ShiroUtils.getLoginName());
73   - ids.add(receiptDetailHistoryList.get(i).getId());
  47 + if((receiptHeader.getFirstStatus()>= QuantityConstant.RECEIPT_HEADER_POSTING && receiptHeader.getLastStatus()>=QuantityConstant.RECEIPT_HEADER_POSTING)||
  48 + (receiptHeader.getFirstStatus()<QuantityConstant.RECEIPT_HEADER_POOL &receiptHeader.getLastStatus()<QuantityConstant.RECEIPT_HEADER_POOL)){
  49 + ReceiptHeaderHistory receiptHeaderHistory = new ReceiptHeaderHistory();
  50 + List<ReceiptDetailHistory> receiptDetailHistoryList = new ArrayList<>();
  51 + //查询入库单明细
  52 + LambdaQueryWrapper<ReceiptDetail> lambdaQueryWrapper = Wrappers.lambdaQuery();
  53 + lambdaQueryWrapper.eq(ReceiptDetail::getReceiptId, id);
  54 + List<ReceiptDetail> list = receiptDetailService.list(lambdaQueryWrapper);
  55 + try {
  56 + //复制到入库历史实体
  57 + BeanUtils.copyProperties(receiptHeaderHistory, receiptHeader);
  58 + for (ReceiptDetail receiptDetail: list) {
  59 + ReceiptDetailHistory receiptDetailHistory = new ReceiptDetailHistory();
  60 + BeanUtils.copyProperties(receiptDetailHistory, receiptDetail);
  61 + receiptDetailHistoryList.add(receiptDetailHistory);
  62 + }
  63 + } catch (IllegalAccessException e) {
  64 + e.printStackTrace();
  65 + } catch (InvocationTargetException e) {
  66 + e.printStackTrace();
74 67 }
75   - if (!receiptDetailService.removeByIds(ids)) {
76   - throw new ServiceException("删除明细表失败");
  68 +
  69 + receiptHeaderHistory.setLastUpdatedBy(ShiroUtils.getLoginName());
  70 + if (!receiptHeaderService.removeById(receiptHeader.getId())){
  71 + throw new ServiceException("删除头表失败");
77 72 }
78   - receiptDetailHistoryService.saveBatch(receiptDetailHistoryList);
  73 + // 当存在明细时删除
  74 + if (list.size()!= 0){
  75 + //删除入库明细
  76 + List<Integer> receiptDetailIds = new ArrayList<>();
  77 + for (int i=0; i<receiptDetailHistoryList.size();i++){
  78 + receiptDetailHistoryList.get(i).setLastUpdatedBy(ShiroUtils.getLoginName());
  79 + receiptDetailIds.add(receiptDetailHistoryList.get(i).getId());
  80 + }
  81 + if (!receiptDetailService.removeByIds(receiptDetailIds)) {
  82 + throw new ServiceException("删除明细表失败");
  83 + }
  84 + if (!receiptDetailHistoryService.saveBatch(receiptDetailHistoryList)){
  85 + throw new ServiceException("新增明细失败");
  86 + } }
  87 + this.save(receiptHeaderHistory);
  88 + }else {
  89 + return AjaxResult.success("入库单没有完成，无法删除");
79 90 }
80   - this.save(receiptHeaderHistory);
81   - }else {
82   - return AjaxResult.success("入库单没有完成，无法删除");
83 91 }
84 92 return AjaxResult.success("删除成功");
85 93 }
... ...
src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java
  View file @3ac7e31
... ... @@ -706,7 +706,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
706 706 Location temp1 = new Location();
707 707 temp1.setCode(sourceLocation);
708 708 temp1.setWarehouseCode(ShiroUtils.getWarehouseCode());
709   - LambdaQueryWrapper<Location> lambda1 = Wrappers.lambdaQuery();
  709 + LambdaQueryWrapper<Location> lambda1 = Wrappers.lambdaQuery(temp1);
710 710 Location loc1 = locationService.getOne(lambda1);
711 711 if (loc1 == null) {
712 712 return AjaxResult.error("源库位：" + sourceLocation + "未找到");
... ... @@ -750,7 +750,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
750 750 TaskHeader taskHeader = new TaskHeader();
751 751 taskHeader.setWarehouseCode(ShiroUtils.getWarehouseCode());
752 752 taskHeader.setCompanyCode(ShiroUtils.getCompanyCodeList().get(0));//获取第一个货主
753   - taskHeader.setInternalTaskType(QuantityConstant.TASK_INTENERTYPE_CHECK);
  753 + taskHeader.setInternalTaskType(QuantityConstant.TASK_INTENERTYPE_TRANSFER);
754 754 taskHeader.setTaskType(QuantityConstant.TASK_TYPE_TRANSFER);
755 755 taskHeader.setContainerCode(loc1.getContainerCode());
756 756 taskHeader.setStatus(QuantityConstant.TASK_STATUS_BUILD);
... ...
src/main/resources/application-dev.yml
  View file @3ac7e31
... ... @@ -66,4 +66,4 @@ logging:
66 66 server:
67 67 port: 8888
68 68 servlet:
69 69 - context-path: /twms/
  70 + context-path: /twms/
70 71 \ No newline at end of file
... ...
src/main/resources/templates/administration/alarmFlow/alarmFlow.html
  View file @3ac7e31
... ... @@ -23,9 +23,9 @@
23 23 <!--</li>-->
24 24 <li class="time">
25 25 <label>创建时间： </label>
26   - <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[createdBegin]"/>
  26 + <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="createdBegin"/>
27 27 <span>-</span>
28   - <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[createdEnd]"/>
  28 + <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="createdEnd"/>
29 29 </li>
30 30 <li>
31 31 <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
... ...
src/main/resources/templates/administration/alarmType/alarmType.html
  View file @3ac7e31
... ... @@ -23,9 +23,9 @@
23 23 <!--</li>-->
24 24 <li class="time">
25 25 <label>创建时间： </label>
26   - <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[createdBegin]"/>
  26 + <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="createdBegin"/>
27 27 <span>-</span>
28   - <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[createdEnd]"/>
  28 + <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="createdEnd"/>
29 29 </li>
30 30 <li>
31 31 <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
... ...
src/main/resources/templates/administration/sendMail/sendMail.html
  View file @3ac7e31
... ... @@ -23,9 +23,9 @@
23 23 <!--</li>-->
24 24 <li class="time">
25 25 <label>创建时间： </label>
26   - <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[createdBegin]"/>
  26 + <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="createdBegin"/>
27 27 <span>-</span>
28   - <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[createdEnd]"/>
  28 + <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="createdEnd"/>
29 29 </li>
30 30 <li>
31 31 <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
... ...
src/main/resources/templates/check/checkHeader/checkHeader.html
  View file @3ac7e31
... ... @@ -32,9 +32,9 @@
32 32 </li>
33 33 <li class="time">
34 34 <label>创建时间： </label>
35   - <input type="text" class="time-input" id="startCreatedTime" placeholder="开始时间" name="params[createdBegin]"/>
  35 + <input type="text" class="time-input" id="startCreatedTime" placeholder="开始时间" name="createdBegin"/>
36 36 <span>-</span>
37   - <input type="text" class="time-input" id="endCreatedTime" placeholder="结束时间" name="params[createdEnd]"/>
  37 + <input type="text" class="time-input" id="endCreatedTime" placeholder="结束时间" name="createdEnd"/>
38 38 </li>
39 39 <li>
40 40 <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
... ...
src/main/resources/templates/check/checkingRegister/checkingRegister.html
  View file @3ac7e31
... ... @@ -32,9 +32,9 @@
32 32 </li>
33 33 <li class="time">
34 34 <label>创建时间： </label>
35   - <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[createdBegin]"/>
  35 + <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="createdBegin"/>
36 36 <span>-</span>
37   - <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[createdEnd]"/>
  37 + <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="createdEnd"/>
38 38 </li>
39 39 <li>
40 40 <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
... ...
src/main/resources/templates/config/bomHeader/bomHeader.html
  View file @3ac7e31
... ... @@ -26,10 +26,10 @@
26 26 <li class="time">
27 27 <label>创建时间： </label>
28 28 <input type="text" class="time-input" id="startTime" placeholder="开始时间"
29   - name="params[createdBegin]"/>
  29 + name="createdBegin"/>
30 30 <span>-</span>
31 31 <input type="text" class="time-input" id="endTime" placeholder="结束时间"
32   - name="params[createdEnd]"/>
  32 + name="createdEnd"/>
33 33 </li>
34 34 <li>
35 35 <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
... ...
src/main/resources/templates/config/carrier/carrier.html
  View file @3ac7e31
... ... @@ -17,9 +17,9 @@
17 17 </li>
18 18 <li class="time">
19 19 <label>创建时间： </label>
20   - <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[createdBegin]"/>
  20 + <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="createdBegin"/>
21 21 <span>-</span>
22   - <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[createdEnd]"/>
  22 + <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="createdEnd"/>
23 23 </li>
24 24 <li>
25 25 <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
... ...
src/main/resources/templates/config/company/company.html
  View file @3ac7e31
... ... @@ -17,9 +17,9 @@
17 17 </li>
18 18 <li class="time">
19 19 <label>创建时间： </label>
20   - <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[createdBegin]"/>
  20 + <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="createdBegin"/>
21 21 <span>-</span>
22   - <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[createdEnd]"/>
  22 + <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="createdEnd"/>
23 23 </li>
24 24 <li>
25 25 <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
... ...
src/main/resources/templates/config/configValue/configValue.html
  View file @3ac7e31
... ... @@ -17,9 +17,9 @@
17 17 </li>
18 18 <li class="time">
19 19 <label>创建时间： </label>
20   - <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[createdBegin]"/>
  20 + <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="createdBegin"/>
21 21 <span>-</span>
22   - <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[createdEnd]"/>
  22 + <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="createdEnd"/>
23 23 </li>
24 24 <li>
25 25 <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
... ...
src/main/resources/templates/config/configWarning/configWarning.html
  View file @3ac7e31
... ... @@ -30,9 +30,9 @@
30 30 </li>
31 31 <li class="time">
32 32 <label>创建时间： </label>
33   - <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[createdBegin]"/>
  33 + <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="createdBegin"/>
34 34 <span>-</span>
35   - <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[createdEnd]"/>
  35 + <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="createdEnd"/>
36 36 </li>
37 37 <li>
38 38 <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
... ...
src/main/resources/templates/config/container/container.html
  View file @3ac7e31
... ... @@ -29,9 +29,9 @@
29 29 </li>
30 30 <li class="time">
31 31 <label>创建时间： </label>
32   - <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[createdBegin]"/>
  32 + <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="createdBegin"/>
33 33 <span>-</span>
34   - <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[createdEnd]"/>
  34 + <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="createdEnd"/>
35 35 </li>
36 36 <li>
37 37 <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
... ...
src/main/resources/templates/config/customer/customer.html
  View file @3ac7e31
... ... @@ -17,9 +17,9 @@
17 17 </li>
18 18 <li class="time">
19 19 <label>创建时间： </label>
20   - <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[createdBegin]"/>
  20 + <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="createdBegin"/>
21 21 <span>-</span>
22   - <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[createdEnd]"/>
  22 + <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="createdEnd"/>
23 23 </li>
24 24 <li>
25 25 <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
... ...
src/main/resources/templates/config/location/location.html
  View file @3ac7e31
... ... @@ -50,9 +50,9 @@
50 50 </li>
51 51 <li class="time">
52 52 <label>创建时间： </label>
53   - <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[createdBegin]"/>
  53 + <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="createdBegin"/>
54 54 <span>-</span>
55   - <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[createdEnd]"/>
  55 + <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="createdEnd"/>
56 56 </li>
57 57 <li>
58 58 <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
... ...
src/main/resources/templates/config/station/station.html
  View file @3ac7e31
... ... @@ -14,9 +14,9 @@
14 14 </li>
15 15 <li class="time">
16 16 <label>创建时间： </label>
17   - <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[createdBegin]"/>
  17 + <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="createdBegin"/>
18 18 <span>-</span>
19   - <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[createdEnd]"/>
  19 + <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="createdEnd"/>
20 20 </li>
21 21 <li>
22 22 <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
... ...
src/main/resources/templates/config/statusFlowHeader/statusFlowHeader.html
  View file @3ac7e31
... ... @@ -32,10 +32,10 @@
32 32 <li class="time">
33 33 <label>创建时间： </label>
34 34 <input type="text" class="time-input" id="startTime" placeholder="开始时间"
35   - name="params[createdBegin]"/>
  35 + name="createdBegin"/>
36 36 <span>-</span>
37 37 <input type="text" class="time-input" id="endTime" placeholder="结束时间"
38   - name="params[createdEnd]"/>
  38 + name="createdEnd"/>
39 39 </li>
40 40 <li>
41 41 <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
... ...
src/main/resources/templates/config/supplier/supplier.html
  View file @3ac7e31
... ... @@ -17,9 +17,9 @@
17 17 </li>
18 18 <li class="time">
19 19 <label>创建时间： </label>
20   - <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[createdBegin]"/>
  20 + <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="createdBegin"/>
21 21 <span>-</span>
22   - <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[createdEnd]"/>
  22 + <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="createdEnd"/>
23 23 </li>
24 24 <li>
25 25 <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
... ...
src/main/resources/templates/inventory/cycleCountDetail/cycleCountDetail.html
  View file @3ac7e31
... ... @@ -65,10 +65,10 @@
65 65 <li class="time">
66 66 <label>创建时间： </label>
67 67 <input type="text" class="time-input" id="startTime" placeholder="开始时间"
68   - name="params[createdBegin]"/>
  68 + name="createdBegin"/>
69 69 <span>-</span>
70 70 <input type="text" class="time-input" id="endTime" placeholder="结束时间"
71   - name="params[createdEnd]"/>
  71 + name="createdEnd"/>
72 72 </li>
73 73 <li>
74 74 创建人：<input id="createdBy" type="text" name="createdBy" />
... ...
src/main/resources/templates/inventory/cycleCountHeader/cycleCountHeader.html
  View file @3ac7e31
... ... @@ -55,10 +55,10 @@
55 55 <li class="time">
56 56 <label>创建时间： </label>
57 57 <input type="text" class="time-input" id="startTime" placeholder="开始时间"
58   - name="params[createdBegin]"/>
  58 + name="createdBegin"/>
59 59 <span>-</span>
60 60 <input type="text" class="time-input" id="endTime" placeholder="结束时间"
61   - name="params[createdEnd]"/>
  61 + name="createdEnd"/>
62 62 </li>
63 63 <li>
64 64 <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
... ...
src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html
  View file @3ac7e31
... ... @@ -67,10 +67,10 @@
67 67 <li class="time" style="height:30px">
68 68 <label>创建时间： </label>
69 69 <input type="text" class="time-input" id="startTime" placeholder="开始时间"
70   - name="params[createdBegin]"/>
  70 + name="createdBegin"/>
71 71 <span>-</span>
72 72 <input type="text" class="time-input" id="endTime" placeholder="结束时间"
73   - name="params[createdEnd]"/>
  73 + name="createdEnd"/>
74 74 </li>
75 75 <li>
76 76 <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
... ...
src/main/resources/templates/inventory/inventoryHeader/inventoryHeader.html
  View file @3ac7e31
... ... @@ -39,10 +39,10 @@
39 39 <li class="time">
40 40 <label>创建时间： </label>
41 41 <input type="text" class="time-input" id="startTime" placeholder="开始时间"
42   - name="params[createdBegin]"/>
  42 + name="createdBegin"/>
43 43 <span>-</span>
44 44 <input type="text" class="time-input" id="endTime" placeholder="结束时间"
45   - name="params[createdEnd]"/>
  45 + name="createdEnd"/>
46 46 </li>
47 47 <li>
48 48 <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
... ...
src/main/resources/templates/inventory/inventoryTransaction/inventoryTransaction.html
  View file @3ac7e31
... ... @@ -58,7 +58,7 @@
58 58 <li>
59 59 项 目 号：<input type="text" name="projectNo"/>
60 60 </li>
61   - <li>
  61 + AjaxResult.error("单据号为"+receiptHeader.getCode()+"入库单不需要审核"); <li>
62 62 交易类型：<select name="type" th:with="type=${@dict.getType('inventoryTransactionType')}">
63 63 <option value="">所有</option>
64 64 <option th:each="e : ${type}" th:text="${e['dictLabel']}" th:value="${e['dictValue']}"></option>
... ... @@ -67,9 +67,9 @@
67 67  
68 68 <li class="time">
69 69 <label>创建时间： </label>
70   - <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[createdBegin]"/>
  70 + <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="createdBegin"/>
71 71 <span>-</span>
72   - <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[createdEnd]"/>
  72 + <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="createdEnd"/>
73 73 </li>
74 74 <li>
75 75 <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
... ...
src/main/resources/templates/receipt/receiptContainerHeader/receiptContainerHeader.html
  View file @3ac7e31
... ... @@ -44,9 +44,9 @@
44 44 </li>
45 45 <li class="time">
46 46 <label>创建时间： </label>
47   - <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[createdBegin]"/>
  47 + <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="createdBegin"/>
48 48 <span>-</span>
49   - <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[createdEnd]"/>
  49 + <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="createdEnd"/>
50 50 </li>
51 51 <li>
52 52 <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
... ...
src/main/resources/templates/receipt/receiptHeader/receiptHeader.html
  View file @3ac7e31
... ... @@ -66,9 +66,9 @@
66 66 </li>
67 67 <li class="time">
68 68 <label>创建时间： </label>
69   - <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[createdBegin]"/>
  69 + <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="createdBegin"/>
70 70 <span>-</span>
71   - <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[createdEnd]"/>
  71 + <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="createdEnd"/>
72 72 </li>
73 73 <li>
74 74 <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
... ... @@ -250,7 +250,7 @@
250 250 {
251 251 field : 'companyCode',
252 252 title : '货主编码',
253   - visible:false
  253 + visible: [[${@table.getVisible('p')}]]
254 254 },
255 255 {
256 256 field : 'warehouseCode',
... ...
src/main/resources/templates/system/config/config.html
  View file @3ac7e31
... ... @@ -24,9 +24,9 @@
24 24 </li>
25 25 <li class="time">
26 26 <label>创建时间： </label>
27   - <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[createdBegin]"/>
  27 + <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="createdBegin"/>
28 28 <span>-</span>
29   - <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[createdEnd]"/>
  29 + <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="createdEnd"/>
30 30 </li>
31 31 <li>
32 32 <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
... ...