diff --git a/src/main/java/com/huaheng/pc/config/table/service/TableService.java b/src/main/java/com/huaheng/pc/config/table/service/TableService.java
new file mode 100644
index 0000000..256168f
--- /dev/null
+++ b/src/main/java/com/huaheng/pc/config/table/service/TableService.java
@@ -0,0 +1,18 @@
+package com.huaheng.pc.config.table.service;
+
+import org.springframework.stereotype.Service;
+
+/**
+ * Created by Enzo Cotter on 2019/11/25.
+ */
+@Service("table")
+public class TableService {
+
+ public boolean getVisible(String value){
+ if ("t".equals(value)){
+ return true;
+ } else {
+ return false;
+ }
+ }
+}
diff --git a/src/main/java/com/huaheng/pc/receipt/receiptHeader/controller/ReceiptHeaderController.java b/src/main/java/com/huaheng/pc/receipt/receiptHeader/controller/ReceiptHeaderController.java
index f24608c..d8d069d 100644
--- a/src/main/java/com/huaheng/pc/receipt/receiptHeader/controller/ReceiptHeaderController.java
+++ b/src/main/java/com/huaheng/pc/receipt/receiptHeader/controller/ReceiptHeaderController.java
@@ -79,9 +79,9 @@ public class ReceiptHeaderController extends BaseController {
.eq(StringUtils.isNotEmpty(receiptHeader.getReceiptType()),
ReceiptHeader::getReceiptType, receiptHeader.getReceiptType())
.eq(StringUtils.isNotEmpty(receiptHeader.getCode()), ReceiptHeader::getCode, receiptHeader.getCode())
- .eq(StringUtils.isNotNull(receiptHeader.getFirstStatus()),
+ .ge(StringUtils.isNotNull(receiptHeader.getFirstStatus()),
ReceiptHeader::getFirstStatus, receiptHeader.getFirstStatus())
- .eq(StringUtils.isNotNull(receiptHeader.getLastStatus()),
+ .le(StringUtils.isNotNull(receiptHeader.getLastStatus()),
ReceiptHeader::getLastStatus, receiptHeader.getLastStatus())
.orderByDesc(ReceiptHeader::getCreated);
@@ -195,7 +195,7 @@ public class ReceiptHeaderController extends BaseController {
@Log(title = "入库-入库单 ",operating = "入库单删除", action = BusinessType.UPDATE)
@PostMapping("/remove")
@ResponseBody
- public AjaxResult remove(@ApiParam(name = "id", value = "入库头表id字符串")Integer ids){
+ public AjaxResult remove(@ApiParam(name = "id", value = "入库头表id字符串")String ids){
if (StringUtils.isNull(ids)){
return AjaxResult.error("id为空");
}
diff --git a/src/main/java/com/huaheng/pc/receipt/receiptHeader/service/ReceiptHeaderService.java b/src/main/java/com/huaheng/pc/receipt/receiptHeader/service/ReceiptHeaderService.java
index 29f1d02..7386ef5 100644
--- a/src/main/java/com/huaheng/pc/receipt/receiptHeader/service/ReceiptHeaderService.java
+++ b/src/main/java/com/huaheng/pc/receipt/receiptHeader/service/ReceiptHeaderService.java
@@ -219,6 +219,7 @@ public class ReceiptHeaderService extends ServiceImpl<ReceiptHeaderMapper, Recei
/**
* 提交审核入库单
*/
+ @Transactional
public AjaxResult submitReview(String ids){
if (StringUtils.isEmpty(ids)){
return AjaxResult.error("id不能为空");
@@ -229,12 +230,16 @@ public class ReceiptHeaderService extends ServiceImpl<ReceiptHeaderMapper, Recei
if (receiptHeader.getFirstStatus()>QuantityConstant.RECEIPT_HEADER_MODERATED ||receiptHeader.getLastStatus()>QuantityConstant.RECEIPT_HEADER_MODERATED){
return AjaxResult.error("单据号为"+receiptHeader.getCode()+"入库单不需要审核");
}
+ LambdaQueryWrapper<ReceiptDetail> lambdaQueryWrapper = Wrappers.lambdaQuery();
+ lambdaQueryWrapper.eq(ReceiptDetail::getReceiptId, idArray[i]);
+ List<ReceiptDetail> receiptDetailList = receiptDetailService.list(lambdaQueryWrapper);
+ if (receiptDetailList.isEmpty()){
+ return AjaxResult.error("单据号为"+receiptHeader.getCode()+"入库单没有明细");
+ }
receiptHeader.setFirstStatus(QuantityConstant.RECEIPT_HEADER_MODERATED);
receiptHeader.setLastStatus(QuantityConstant.RECEIPT_HEADER_MODERATED);
if (!this.updateById(receiptHeader)){
throw new ServiceException("更新入库头表失败");
- } else {
- return AjaxResult.success("提交审核成功，请等待审核");
}
}
return AjaxResult.success("提交审核成功");
diff --git a/src/main/java/com/huaheng/pc/receipt/receiptHeaderHistory/service/ReceiptHeaderHistoryService.java b/src/main/java/com/huaheng/pc/receipt/receiptHeaderHistory/service/ReceiptHeaderHistoryService.java
index ec1111e..255d00d 100644
--- a/src/main/java/com/huaheng/pc/receipt/receiptHeaderHistory/service/ReceiptHeaderHistoryService.java
+++ b/src/main/java/com/huaheng/pc/receipt/receiptHeaderHistory/service/ReceiptHeaderHistoryService.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.huaheng.common.constant.QuantityConstant;
import com.huaheng.common.exception.service.ServiceException;
+import com.huaheng.common.support.Convert;
import com.huaheng.common.utils.security.ShiroUtils;
import com.huaheng.framework.web.domain.AjaxResult;
import com.huaheng.pc.receipt.receiptDetail.domain.ReceiptDetail;
@@ -18,6 +19,7 @@ import javax.annotation.Resource;
import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.huaheng.pc.receipt.receiptHeaderHistory.domain.ReceiptHeaderHistory;
@@ -35,51 +37,57 @@ public class ReceiptHeaderHistoryService extends ServiceImpl<ReceiptHeaderHistor
private ReceiptDetailHistoryService receiptDetailHistoryService;
@Transactional
- public AjaxResult add(Integer id){
- ReceiptHeader receiptHeader = receiptHeaderService.getById(id);
- if (receiptHeader == null) return AjaxResult.success("");
- if((receiptHeader.getFirstStatus()>= QuantityConstant.RECEIPT_HEADER_POSTING && receiptHeader.getLastStatus()>=QuantityConstant.RECEIPT_HEADER_POSTING)||
- (receiptHeader.getFirstStatus()<QuantityConstant.RECEIPT_HEADER_POOL &receiptHeader.getLastStatus()<QuantityConstant.RECEIPT_HEADER_POOL)){
- ReceiptHeaderHistory receiptHeaderHistory = new ReceiptHeaderHistory();
- List<ReceiptDetailHistory> receiptDetailHistoryList = new ArrayList<>();
- //查询入库单明细
- LambdaQueryWrapper<ReceiptDetail> lambdaQueryWrapper = Wrappers.lambdaQuery();
- lambdaQueryWrapper.eq(ReceiptDetail::getReceiptId, id);
- List<ReceiptDetail> list = receiptDetailService.list(lambdaQueryWrapper);
- try {
- //复制到入库历史实体
- BeanUtils.copyProperties(receiptHeaderHistory, receiptHeader);
- for (ReceiptDetail receiptDetail: list) {
- ReceiptDetailHistory receiptDetailHistory = new ReceiptDetailHistory();
- BeanUtils.copyProperties(receiptDetailHistory, receiptDetail);
- receiptDetailHistoryList.add(receiptDetailHistory);
- }
- } catch (IllegalAccessException e) {
- e.printStackTrace();
- } catch (InvocationTargetException e) {
- e.printStackTrace();
- }
-
- receiptHeaderHistory.setLastUpdatedBy(ShiroUtils.getLoginName());
- if (!receiptHeaderService.removeById(receiptHeader.getId())){
- throw new ServiceException("删除头表失败");
+ public AjaxResult add(String ids){
+ List<Integer> idList = Arrays.asList(Convert.toIntArray(ids));
+ for (Integer id : idList) {
+ ReceiptHeader receiptHeader = receiptHeaderService.getById(id);
+ if (receiptHeader == null) {
+ return AjaxResult.success("");
}
- // 当存在明细时删除
- if (list.size()!= 0){
- //删除入库明细
- List<Integer> ids = new ArrayList<>();
- for (int i=0; i<receiptDetailHistoryList.size();i++){
- receiptDetailHistoryList.get(i).setLastUpdatedBy(ShiroUtils.getLoginName());
- ids.add(receiptDetailHistoryList.get(i).getId());
+ if((receiptHeader.getFirstStatus()>= QuantityConstant.RECEIPT_HEADER_POSTING && receiptHeader.getLastStatus()>=QuantityConstant.RECEIPT_HEADER_POSTING)||
+ (receiptHeader.getFirstStatus()<QuantityConstant.RECEIPT_HEADER_POOL &receiptHeader.getLastStatus()<QuantityConstant.RECEIPT_HEADER_POOL)){
+ ReceiptHeaderHistory receiptHeaderHistory = new ReceiptHeaderHistory();
+ List<ReceiptDetailHistory> receiptDetailHistoryList = new ArrayList<>();
+ //查询入库单明细
+ LambdaQueryWrapper<ReceiptDetail> lambdaQueryWrapper = Wrappers.lambdaQuery();
+ lambdaQueryWrapper.eq(ReceiptDetail::getReceiptId, id);
+ List<ReceiptDetail> list = receiptDetailService.list(lambdaQueryWrapper);
+ try {
+ //复制到入库历史实体
+ BeanUtils.copyProperties(receiptHeaderHistory, receiptHeader);
+ for (ReceiptDetail receiptDetail: list) {
+ ReceiptDetailHistory receiptDetailHistory = new ReceiptDetailHistory();
+ BeanUtils.copyProperties(receiptDetailHistory, receiptDetail);
+ receiptDetailHistoryList.add(receiptDetailHistory);
+ }
+ } catch (IllegalAccessException e) {
+ e.printStackTrace();
+ } catch (InvocationTargetException e) {
+ e.printStackTrace();
}
- if (!receiptDetailService.removeByIds(ids)) {
- throw new ServiceException("删除明细表失败");
+
+ receiptHeaderHistory.setLastUpdatedBy(ShiroUtils.getLoginName());
+ if (!receiptHeaderService.removeById(receiptHeader.getId())){
+ throw new ServiceException("删除头表失败");
}
- receiptDetailHistoryService.saveBatch(receiptDetailHistoryList);
+ // 当存在明细时删除
+ if (list.size()!= 0){
+ //删除入库明细
+ List<Integer> receiptDetailIds = new ArrayList<>();
+ for (int i=0; i<receiptDetailHistoryList.size();i++){
+ receiptDetailHistoryList.get(i).setLastUpdatedBy(ShiroUtils.getLoginName());
+ receiptDetailIds.add(receiptDetailHistoryList.get(i).getId());
+ }
+ if (!receiptDetailService.removeByIds(receiptDetailIds)) {
+ throw new ServiceException("删除明细表失败");
+ }
+ if (!receiptDetailHistoryService.saveBatch(receiptDetailHistoryList)){
+ throw new ServiceException("新增明细失败");
+ } }
+ this.save(receiptHeaderHistory);
+ }else {
+ return AjaxResult.success("入库单没有完成，无法删除");
}
- this.save(receiptHeaderHistory);
- }else {
- return AjaxResult.success("入库单没有完成，无法删除");
}
return AjaxResult.success("删除成功");
}
diff --git a/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java b/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java
index fe8783f..ba29951 100644
--- a/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java
+++ b/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java
@@ -706,7 +706,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
Location temp1 = new Location();
temp1.setCode(sourceLocation);
temp1.setWarehouseCode(ShiroUtils.getWarehouseCode());
- LambdaQueryWrapper<Location> lambda1 = Wrappers.lambdaQuery();
+ LambdaQueryWrapper<Location> lambda1 = Wrappers.lambdaQuery(temp1);
Location loc1 = locationService.getOne(lambda1);
if (loc1 == null) {
return AjaxResult.error("源库位：" + sourceLocation + "未找到");
@@ -750,7 +750,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
TaskHeader taskHeader = new TaskHeader();
taskHeader.setWarehouseCode(ShiroUtils.getWarehouseCode());
taskHeader.setCompanyCode(ShiroUtils.getCompanyCodeList().get(0));//获取第一个货主
- taskHeader.setInternalTaskType(QuantityConstant.TASK_INTENERTYPE_CHECK);
+ taskHeader.setInternalTaskType(QuantityConstant.TASK_INTENERTYPE_TRANSFER);
taskHeader.setTaskType(QuantityConstant.TASK_TYPE_TRANSFER);
taskHeader.setContainerCode(loc1.getContainerCode());
taskHeader.setStatus(QuantityConstant.TASK_STATUS_BUILD);
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index f699ea0..7b9ead6 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -66,4 +66,4 @@ logging:
server:
port: 8888
servlet:
- context-path: /twms/
+ context-path: /twms/
\ No newline at end of file
diff --git a/src/main/resources/templates/administration/alarmFlow/alarmFlow.html b/src/main/resources/templates/administration/alarmFlow/alarmFlow.html
index f1248d0..5a908f0 100644
--- a/src/main/resources/templates/administration/alarmFlow/alarmFlow.html
+++ b/src/main/resources/templates/administration/alarmFlow/alarmFlow.html
@@ -23,9 +23,9 @@
<!--</li>-->
<li class="time">
<label>创建时间： </label>
- <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[createdBegin]"/>
+ <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="createdBegin"/>
<span>-</span>
- <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[createdEnd]"/>
+ <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="createdEnd"/>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i> 搜索</a>
diff --git a/src/main/resources/templates/administration/alarmType/alarmType.html b/src/main/resources/templates/administration/alarmType/alarmType.html
index 69fd8e8..0c4f608 100644
--- a/src/main/resources/templates/administration/alarmType/alarmType.html
+++ b/src/main/resources/templates/administration/alarmType/alarmType.html
@@ -23,9 +23,9 @@
<!--</li>-->
<li class="time">
<label>创建时间： </label>
- <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[createdBegin]"/>
+ <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="createdBegin"/>
<span>-</span>
- <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[createdEnd]"/>
+ <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="createdEnd"/>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i> 搜索</a>
diff --git a/src/main/resources/templates/administration/sendMail/sendMail.html b/src/main/resources/templates/administration/sendMail/sendMail.html
index 08d2045..79f6f04 100644
--- a/src/main/resources/templates/administration/sendMail/sendMail.html
+++ b/src/main/resources/templates/administration/sendMail/sendMail.html
@@ -23,9 +23,9 @@
<!--</li>-->
<li class="time">
<label>创建时间： </label>
- <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[createdBegin]"/>
+ <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="createdBegin"/>
<span>-</span>
- <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[createdEnd]"/>
+ <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="createdEnd"/>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i> 搜索</a>
diff --git a/src/main/resources/templates/check/checkHeader/checkHeader.html b/src/main/resources/templates/check/checkHeader/checkHeader.html
index dcf6346..ce05da2 100644
--- a/src/main/resources/templates/check/checkHeader/checkHeader.html
+++ b/src/main/resources/templates/check/checkHeader/checkHeader.html
@@ -32,9 +32,9 @@
</li>
<li class="time">
<label>创建时间： </label>
- <input type="text" class="time-input" id="startCreatedTime" placeholder="开始时间" name="params[createdBegin]"/>
+ <input type="text" class="time-input" id="startCreatedTime" placeholder="开始时间" name="createdBegin"/>
<span>-</span>
- <input type="text" class="time-input" id="endCreatedTime" placeholder="结束时间" name="params[createdEnd]"/>
+ <input type="text" class="time-input" id="endCreatedTime" placeholder="结束时间" name="createdEnd"/>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i> 搜索</a>
diff --git a/src/main/resources/templates/check/checkingRegister/checkingRegister.html b/src/main/resources/templates/check/checkingRegister/checkingRegister.html
index 22e3298..9f9105c 100644
--- a/src/main/resources/templates/check/checkingRegister/checkingRegister.html
+++ b/src/main/resources/templates/check/checkingRegister/checkingRegister.html
@@ -32,9 +32,9 @@
</li>
<li class="time">
<label>创建时间： </label>
- <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[createdBegin]"/>
+ <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="createdBegin"/>
<span>-</span>
- <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[createdEnd]"/>
+ <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="createdEnd"/>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i> 搜索</a>
diff --git a/src/main/resources/templates/config/bomHeader/bomHeader.html b/src/main/resources/templates/config/bomHeader/bomHeader.html
index 1f39f7a..9132019 100644
--- a/src/main/resources/templates/config/bomHeader/bomHeader.html
+++ b/src/main/resources/templates/config/bomHeader/bomHeader.html
@@ -26,10 +26,10 @@
<li class="time">
<label>创建时间： </label>
<input type="text" class="time-input" id="startTime" placeholder="开始时间"
- name="params[createdBegin]"/>
+ name="createdBegin"/>
<span>-</span>
<input type="text" class="time-input" id="endTime" placeholder="结束时间"
- name="params[createdEnd]"/>
+ name="createdEnd"/>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
diff --git a/src/main/resources/templates/config/carrier/carrier.html b/src/main/resources/templates/config/carrier/carrier.html
index 4a43f39..4615cfa 100644
--- a/src/main/resources/templates/config/carrier/carrier.html
+++ b/src/main/resources/templates/config/carrier/carrier.html
@@ -17,9 +17,9 @@
</li>
<li class="time">
<label>创建时间： </label>
- <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[createdBegin]"/>
+ <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="createdBegin"/>
<span>-</span>
- <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[createdEnd]"/>
+ <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="createdEnd"/>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i> 搜索</a>
diff --git a/src/main/resources/templates/config/company/company.html b/src/main/resources/templates/config/company/company.html
index b02fb65..8d0b361 100644
--- a/src/main/resources/templates/config/company/company.html
+++ b/src/main/resources/templates/config/company/company.html
@@ -17,9 +17,9 @@
</li>
<li class="time">
<label>创建时间： </label>
- <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[createdBegin]"/>
+ <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="createdBegin"/>
<span>-</span>
- <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[createdEnd]"/>
+ <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="createdEnd"/>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i> 搜索</a>
diff --git a/src/main/resources/templates/config/configValue/configValue.html b/src/main/resources/templates/config/configValue/configValue.html
index dd36581..3e331d4 100644
--- a/src/main/resources/templates/config/configValue/configValue.html
+++ b/src/main/resources/templates/config/configValue/configValue.html
@@ -17,9 +17,9 @@
</li>
<li class="time">
<label>创建时间： </label>
- <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[createdBegin]"/>
+ <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="createdBegin"/>
<span>-</span>
- <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[createdEnd]"/>
+ <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="createdEnd"/>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i> 搜索</a>
diff --git a/src/main/resources/templates/config/configWarning/configWarning.html b/src/main/resources/templates/config/configWarning/configWarning.html
index 5ea4807..6c9b521 100644
--- a/src/main/resources/templates/config/configWarning/configWarning.html
+++ b/src/main/resources/templates/config/configWarning/configWarning.html
@@ -30,9 +30,9 @@
</li>
<li class="time">
<label>创建时间： </label>
- <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[createdBegin]"/>
+ <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="createdBegin"/>
<span>-</span>
- <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[createdEnd]"/>
+ <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="createdEnd"/>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i> 搜索</a>
diff --git a/src/main/resources/templates/config/container/container.html b/src/main/resources/templates/config/container/container.html
index efb7bfc..55e0cd0 100644
--- a/src/main/resources/templates/config/container/container.html
+++ b/src/main/resources/templates/config/container/container.html
@@ -29,9 +29,9 @@
</li>
<li class="time">
<label>创建时间： </label>
- <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[createdBegin]"/>
+ <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="createdBegin"/>
<span>-</span>
- <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[createdEnd]"/>
+ <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="createdEnd"/>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i> 搜索</a>
diff --git a/src/main/resources/templates/config/customer/customer.html b/src/main/resources/templates/config/customer/customer.html
index f84be52..d17371f 100644
--- a/src/main/resources/templates/config/customer/customer.html
+++ b/src/main/resources/templates/config/customer/customer.html
@@ -17,9 +17,9 @@
</li>
<li class="time">
<label>创建时间： </label>
- <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[createdBegin]"/>
+ <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="createdBegin"/>
<span>-</span>
- <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[createdEnd]"/>
+ <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="createdEnd"/>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i> 搜索</a>
diff --git a/src/main/resources/templates/config/location/location.html b/src/main/resources/templates/config/location/location.html
index 06d13b5..d983495 100644
--- a/src/main/resources/templates/config/location/location.html
+++ b/src/main/resources/templates/config/location/location.html
@@ -50,9 +50,9 @@
</li>
<li class="time">
<label>创建时间： </label>
- <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[createdBegin]"/>
+ <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="createdBegin"/>
<span>-</span>
- <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[createdEnd]"/>
+ <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="createdEnd"/>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i> 搜索</a>
diff --git a/src/main/resources/templates/config/station/station.html b/src/main/resources/templates/config/station/station.html
index 6b5f357..2b0806f 100644
--- a/src/main/resources/templates/config/station/station.html
+++ b/src/main/resources/templates/config/station/station.html
@@ -14,9 +14,9 @@
</li>
<li class="time">
<label>创建时间： </label>
- <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[createdBegin]"/>
+ <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="createdBegin"/>
<span>-</span>
- <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[createdEnd]"/>
+ <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="createdEnd"/>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i> 搜索</a>
diff --git a/src/main/resources/templates/config/statusFlowHeader/statusFlowHeader.html b/src/main/resources/templates/config/statusFlowHeader/statusFlowHeader.html
index dca7c9b..9bd1208 100644
--- a/src/main/resources/templates/config/statusFlowHeader/statusFlowHeader.html
+++ b/src/main/resources/templates/config/statusFlowHeader/statusFlowHeader.html
@@ -32,10 +32,10 @@
<li class="time">
<label>创建时间： </label>
<input type="text" class="time-input" id="startTime" placeholder="开始时间"
- name="params[createdBegin]"/>
+ name="createdBegin"/>
<span>-</span>
<input type="text" class="time-input" id="endTime" placeholder="结束时间"
- name="params[createdEnd]"/>
+ name="createdEnd"/>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
diff --git a/src/main/resources/templates/config/supplier/supplier.html b/src/main/resources/templates/config/supplier/supplier.html
index 651e3b6..fff0b83 100644
--- a/src/main/resources/templates/config/supplier/supplier.html
+++ b/src/main/resources/templates/config/supplier/supplier.html
@@ -17,9 +17,9 @@
</li>
<li class="time">
<label>创建时间： </label>
- <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[createdBegin]"/>
+ <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="createdBegin"/>
<span>-</span>
- <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[createdEnd]"/>
+ <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="createdEnd"/>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i> 搜索</a>
diff --git a/src/main/resources/templates/inventory/cycleCountDetail/cycleCountDetail.html b/src/main/resources/templates/inventory/cycleCountDetail/cycleCountDetail.html
index 318e153..9e24329 100644
--- a/src/main/resources/templates/inventory/cycleCountDetail/cycleCountDetail.html
+++ b/src/main/resources/templates/inventory/cycleCountDetail/cycleCountDetail.html
@@ -65,10 +65,10 @@
<li class="time">
<label>创建时间： </label>
<input type="text" class="time-input" id="startTime" placeholder="开始时间"
- name="params[createdBegin]"/>
+ name="createdBegin"/>
<span>-</span>
<input type="text" class="time-input" id="endTime" placeholder="结束时间"
- name="params[createdEnd]"/>
+ name="createdEnd"/>
</li>
<li>
创建人：<input id="createdBy" type="text" name="createdBy" />
diff --git a/src/main/resources/templates/inventory/cycleCountHeader/cycleCountHeader.html b/src/main/resources/templates/inventory/cycleCountHeader/cycleCountHeader.html
index 54310a5..f5ee6ac 100644
--- a/src/main/resources/templates/inventory/cycleCountHeader/cycleCountHeader.html
+++ b/src/main/resources/templates/inventory/cycleCountHeader/cycleCountHeader.html
@@ -55,10 +55,10 @@
<li class="time">
<label>创建时间： </label>
<input type="text" class="time-input" id="startTime" placeholder="开始时间"
- name="params[createdBegin]"/>
+ name="createdBegin"/>
<span>-</span>
<input type="text" class="time-input" id="endTime" placeholder="结束时间"
- name="params[createdEnd]"/>
+ name="createdEnd"/>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
diff --git a/src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html b/src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html
index b2bda68..172e314 100644
--- a/src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html
+++ b/src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html
@@ -67,10 +67,10 @@
<li class="time" style="height:30px">
<label>创建时间： </label>
<input type="text" class="time-input" id="startTime" placeholder="开始时间"
- name="params[createdBegin]"/>
+ name="createdBegin"/>
<span>-</span>
<input type="text" class="time-input" id="endTime" placeholder="结束时间"
- name="params[createdEnd]"/>
+ name="createdEnd"/>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
diff --git a/src/main/resources/templates/inventory/inventoryHeader/inventoryHeader.html b/src/main/resources/templates/inventory/inventoryHeader/inventoryHeader.html
index 81325e5..d33bfbe 100644
--- a/src/main/resources/templates/inventory/inventoryHeader/inventoryHeader.html
+++ b/src/main/resources/templates/inventory/inventoryHeader/inventoryHeader.html
@@ -39,10 +39,10 @@
<li class="time">
<label>创建时间： </label>
<input type="text" class="time-input" id="startTime" placeholder="开始时间"
- name="params[createdBegin]"/>
+ name="createdBegin"/>
<span>-</span>
<input type="text" class="time-input" id="endTime" placeholder="结束时间"
- name="params[createdEnd]"/>
+ name="createdEnd"/>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
diff --git a/src/main/resources/templates/inventory/inventoryTransaction/inventoryTransaction.html b/src/main/resources/templates/inventory/inventoryTransaction/inventoryTransaction.html
index c35f1ef..3f9a945 100644
--- a/src/main/resources/templates/inventory/inventoryTransaction/inventoryTransaction.html
+++ b/src/main/resources/templates/inventory/inventoryTransaction/inventoryTransaction.html
@@ -58,7 +58,7 @@
<li>
项 目 号：<input type="text" name="projectNo"/>
</li>
- <li>
+ AjaxResult.error("单据号为"+receiptHeader.getCode()+"入库单不需要审核"); <li>
交易类型：<select name="type" th:with="type=${@dict.getType('inventoryTransactionType')}">
<option value="">所有</option>
<option th:each="e : ${type}" th:text="${e['dictLabel']}" th:value="${e['dictValue']}"></option>
@@ -67,9 +67,9 @@
<li class="time">
<label>创建时间： </label>
- <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[createdBegin]"/>
+ <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="createdBegin"/>
<span>-</span>
- <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[createdEnd]"/>
+ <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="createdEnd"/>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i> 搜索</a>
diff --git a/src/main/resources/templates/receipt/receiptContainerHeader/receiptContainerHeader.html b/src/main/resources/templates/receipt/receiptContainerHeader/receiptContainerHeader.html
index 46b0642..8ff7a94 100644
--- a/src/main/resources/templates/receipt/receiptContainerHeader/receiptContainerHeader.html
+++ b/src/main/resources/templates/receipt/receiptContainerHeader/receiptContainerHeader.html
@@ -44,9 +44,9 @@
</li>
<li class="time">
<label>创建时间： </label>
- <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[createdBegin]"/>
+ <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="createdBegin"/>
<span>-</span>
- <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[createdEnd]"/>
+ <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="createdEnd"/>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i> 搜索</a>
diff --git a/src/main/resources/templates/receipt/receiptHeader/receiptHeader.html b/src/main/resources/templates/receipt/receiptHeader/receiptHeader.html
index e583e89..60122e6 100644
--- a/src/main/resources/templates/receipt/receiptHeader/receiptHeader.html
+++ b/src/main/resources/templates/receipt/receiptHeader/receiptHeader.html
@@ -66,9 +66,9 @@
</li>
<li class="time">
<label>创建时间： </label>
- <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[createdBegin]"/>
+ <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="createdBegin"/>
<span>-</span>
- <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[createdEnd]"/>
+ <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="createdEnd"/>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i> 搜索</a>
@@ -250,7 +250,7 @@
{
field : 'companyCode',
title : '货主编码',
- visible:false
+ visible: [[${@table.getVisible('p')}]]
},
{
field : 'warehouseCode',
diff --git a/src/main/resources/templates/system/config/config.html b/src/main/resources/templates/system/config/config.html
index 0b97658..f1e43af 100644
--- a/src/main/resources/templates/system/config/config.html
+++ b/src/main/resources/templates/system/config/config.html
@@ -24,9 +24,9 @@
</li>
<li class="time">
<label>创建时间： </label>
- <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[createdBegin]"/>
+ <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="createdBegin"/>
<span>-</span>
- <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[createdEnd]"/>
+ <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="createdEnd"/>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i> 搜索</a>