From 773f59ebab9a56d34b02ece3914787979f7c5f3e Mon Sep 17 00:00:00 2001
From: yiwenpeng <ywp303@163.com>
Date: Sat, 19 Aug 2023 14:43:29 +0800
Subject: [PATCH] feat: 模糊搜索
---
src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java | 3 +++
src/main/java/com/huaheng/pc/inventory/inventoryTransaction/controller/InventoryTransactionController.java | 3 +++
src/main/java/com/huaheng/pc/receipt/receiptHeader/controller/ReceiptHeaderController.java | 2 ++
src/main/java/com/huaheng/pc/receipt/receiptHeaderHistory/controller/ReceiptHeaderHistoryController.java | 35 ++++++++++++++++++-----------------
src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html | 6 ++++++
src/main/resources/templates/inventory/inventoryTransaction/inventoryTransaction.html | 6 ++++++
src/main/resources/templates/receipt/receiptHeader/receiptHeader.html | 6 ++++++
src/main/resources/templates/receipt/receiptHeaderHistory/receiptHeaderHistory.html | 6 ++++++
8 files changed, 50 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java b/src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java
index 259e753..03a46f1 100644
--- a/src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java
+++ b/src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java
@@ -108,6 +108,9 @@ public class InventoryDetailController extends BaseController {
.eq(StringUtils.isNotEmpty(inventoryDetail.getLockCode()), InventoryDetail::getLockCode, inventoryDetail.getLockCode())//库存锁
.eq(StringUtils.isNotEmpty(inventoryDetail.getZoneCode()), InventoryDetail::getZoneCode, inventoryDetail.getZoneCode()) //库区
.eq(StringUtils.isNotEmpty(inventoryDetail.getNoticeCode()), InventoryDetail::getNoticeCode, inventoryDetail.getNoticeCode()) //通知单号
+ .eq(StringUtils.isNotEmpty(inventoryDetail.getWarehouse()), InventoryDetail::getWarehouse, inventoryDetail.getWarehouse()) //原仓库编码
+ .like(StringUtils.isNotEmpty(inventoryDetail.getWarehouseName()), InventoryDetail::getWarehouseName, inventoryDetail.getWarehouseName()) //原仓库名称
+
//货主
.in(StringUtils.isNotEmpty(inventoryDetail.getCompanyCode()), InventoryDetail::getCompanyCode, inventoryDetail.getCompanyCode())
diff --git a/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/controller/InventoryTransactionController.java b/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/controller/InventoryTransactionController.java
index cbe6d3d..7aae758 100644
--- a/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/controller/InventoryTransactionController.java
+++ b/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/controller/InventoryTransactionController.java
@@ -12,6 +12,7 @@ import com.huaheng.framework.web.controller.BaseController;
import com.huaheng.framework.web.page.PageDomain;
import com.huaheng.framework.web.page.TableDataInfo;
import com.huaheng.framework.web.page.TableSupport;
+import com.huaheng.pc.inventory.inventoryDetail.domain.InventoryDetail;
import com.huaheng.pc.inventory.inventoryDetail.service.InventoryDetailService;
import com.huaheng.pc.inventory.inventoryHeader.service.InventoryHeaderService;
import com.huaheng.pc.inventory.inventoryTransaction.domain.InventoryTransaction;
@@ -84,6 +85,8 @@ public class InventoryTransactionController extends BaseController {
//.notIn(InventoryTransaction::getTransactionType, 70, 80)
.eq(StringUtils.isNotEmpty(inventoryTransaction.getReferCode()), InventoryTransaction::getReferCode, inventoryTransaction.getReferCode())//上游单号
.like(StringUtils.isNotEmpty(inventoryTransaction.getCreatedBy()), InventoryTransaction::getCreatedBy, inventoryTransaction.getCreatedBy())//创建用户
+ .eq(StringUtils.isNotEmpty(inventoryTransaction.getWarehouse()), InventoryTransaction::getWarehouse, inventoryTransaction.getWarehouse()) //原仓库编码
+ .like(StringUtils.isNotEmpty(inventoryTransaction.getWarehouseName()), InventoryTransaction::getWarehouseName, inventoryTransaction.getWarehouseName()) //原仓库名称
//货主
.in(InventoryTransaction::getCompanyCode, ShiroUtils.getCompanyCodeList())
.orderByDesc(InventoryTransaction::getId);
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 7fa14c0..8faa903 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
@@ -110,6 +110,8 @@ public class ReceiptHeaderController extends BaseController {
.inSql(StringUtils.isNotNull(receiptHeader.getNoticeNo()) && StringUtils.isNotEmpty(receiptHeader.getNoticeNo()), ReceiptHeader::getId, "select receiptId from receipt_detail where noticeNo like '%" + receiptHeader.getNoticeNo() + "%'")
.eq(StringUtils.isNotEmpty(receiptHeader.getReceiptType()), ReceiptHeader::getReceiptType, receiptHeader.getReceiptType())
.like(StringUtils.isNotEmpty(receiptHeader.getCode()), ReceiptHeader::getCode, receiptHeader.getCode())
+ .like(StringUtils.isNotEmpty(receiptHeader.getReceiptNote()), ReceiptHeader::getReceiptNote, receiptHeader.getReceiptNote())
+ .like(StringUtils.isNotEmpty(receiptHeader.getMaterialColor()), ReceiptHeader::getMaterialColor, receiptHeader.getMaterialColor())
.eq(StringUtils.isNotEmpty(receiptHeader.getReferCode()), ReceiptHeader::getReferCode, receiptHeader.getReferCode())
.eq(StringUtils.isNotNull(receiptHeader.getPushSuccessStatus()), ReceiptHeader::getPushSuccessStatus, receiptHeader.getPushSuccessStatus())
.orderByAsc(ReceiptHeader::getLastStatus)
diff --git a/src/main/java/com/huaheng/pc/receipt/receiptHeaderHistory/controller/ReceiptHeaderHistoryController.java b/src/main/java/com/huaheng/pc/receipt/receiptHeaderHistory/controller/ReceiptHeaderHistoryController.java
index 75316c6..5ff0c21 100644
--- a/src/main/java/com/huaheng/pc/receipt/receiptHeaderHistory/controller/ReceiptHeaderHistoryController.java
+++ b/src/main/java/com/huaheng/pc/receipt/receiptHeaderHistory/controller/ReceiptHeaderHistoryController.java
@@ -37,15 +37,14 @@ import java.util.List;
@RequestMapping("/receipt/receiptHeaderHistory")
public class ReceiptHeaderHistoryController extends BaseController {
- private String prefix="receipt/receiptHeaderHistory";
+ private String prefix = "receipt/receiptHeaderHistory";
@Resource
private ReceiptHeaderHistoryService receiptHeaderHistoryService;
@RequiresPermissions("receipt:receiptHeaderHistory:view")
@GetMapping()
- public String containerCapacity()
- {
+ public String containerCapacity() {
return prefix + "/receiptHeaderHistory";
}
@@ -56,7 +55,7 @@ public class ReceiptHeaderHistoryController extends BaseController {
@Log(title = "入库-入库单头表", operating = "查看入库单列表", action = BusinessType.GRANT)
@PostMapping("/list")
@ResponseBody
- public TableDataInfo list(@ApiParam(name="receiptDetail",value="入库头表") ReceiptHeaderHistory receiptHeader,
+ public TableDataInfo list(@ApiParam(name = "receiptDetail", value = "入库头表") ReceiptHeaderHistory receiptHeader,
@ApiParam(name = "createdBegin", value = "起止时间") String createdBegin,
@ApiParam(name = "createdEnd", value = "结束时间") String createdEnd,
Integer statusFirst, Integer statusLast) {
@@ -66,44 +65,46 @@ public class ReceiptHeaderHistoryController extends BaseController {
Integer pageSize = pageDomain.getPageSize();
List<ReceiptHeaderHistory> list = new ArrayList<>();
- if (QuantityConstant.HEADER_STATE.equals(receiptHeader.getLastStatus())){
+ if (QuantityConstant.HEADER_STATE.equals(receiptHeader.getLastStatus())) {
lambdaQueryWrapper.le(ReceiptHeaderHistory::getLastStatus, receiptHeader.getLastStatus());
- }else {
+ } else {
lambdaQueryWrapper.eq(StringUtils.isNotNull(receiptHeader.getLastStatus()),
ReceiptHeaderHistory::getLastStatus, receiptHeader.getLastStatus());
}
- if (QuantityConstant.HEADER_STATE.equals(receiptHeader.getFirstStatus())){
+ if (QuantityConstant.HEADER_STATE.equals(receiptHeader.getFirstStatus())) {
lambdaQueryWrapper.le(ReceiptHeaderHistory::getFirstStatus, receiptHeader.getFirstStatus());
- }else {
+ } else {
lambdaQueryWrapper.eq(StringUtils.isNotNull(receiptHeader.getFirstStatus()),
ReceiptHeaderHistory::getFirstStatus, receiptHeader.getFirstStatus());
}
lambdaQueryWrapper.ge(StringUtils.isNotEmpty(createdBegin), ReceiptHeaderHistory::getCreated, createdBegin)
.le(StringUtils.isNotEmpty(createdEnd), ReceiptHeaderHistory::getCreated, createdEnd)
- .in(StringUtils.isNotEmpty(receiptHeader.getCompanyCode()),ReceiptHeaderHistory::getCompanyCode, receiptHeader.getCompanyCode())
+ .in(StringUtils.isNotEmpty(receiptHeader.getCompanyCode()), ReceiptHeaderHistory::getCompanyCode, receiptHeader.getCompanyCode())
.in(StringUtils.isEmpty(receiptHeader.getCompanyCode()), ReceiptHeaderHistory::getCompanyCode, ShiroUtils.getCompanyCodeList())
.like(StringUtils.isNotEmpty(receiptHeader.getLastUpdatedBy()), ReceiptHeaderHistory::getLastUpdatedBy, receiptHeader.getLastUpdatedBy())
.in(StringUtils.isEmpty(receiptHeader.getCompanyCode()), ReceiptHeaderHistory::getCompanyCode, ShiroUtils.getCompanyCodeList())
.like(StringUtils.isNotEmpty(receiptHeader.getUserDef3()), ReceiptHeaderHistory::getUserDef3, receiptHeader.getUserDef3())
.eq(ReceiptHeaderHistory::getWarehouseCode, ShiroUtils.getWarehouseCode())
- .inSql(StringUtils.isNotNull(receiptHeader.getSNNO()) && StringUtils.isNotEmpty(receiptHeader.getSNNO()),ReceiptHeaderHistory::getId, "select receiptId from receipt_detail_history where attribute4 like '%"+receiptHeader.getSNNO()+"%'")
- .inSql(StringUtils.isNotNull(receiptHeader.getNoticeNo()) && StringUtils.isNotEmpty(receiptHeader.getNoticeNo()),ReceiptHeaderHistory::getId, "select receiptId from receipt_detail_history where noticeNo like '%"+receiptHeader.getNoticeNo()+"%'")
+ .inSql(StringUtils.isNotNull(receiptHeader.getSNNO()) && StringUtils.isNotEmpty(receiptHeader.getSNNO()), ReceiptHeaderHistory::getId, "select receiptId from receipt_detail_history where attribute4 like '%" + receiptHeader.getSNNO() + "%'")
+ .inSql(StringUtils.isNotNull(receiptHeader.getNoticeNo()) && StringUtils.isNotEmpty(receiptHeader.getNoticeNo()), ReceiptHeaderHistory::getId, "select receiptId from receipt_detail_history where noticeNo like '%" + receiptHeader.getNoticeNo() + "%'")
.like(StringUtils.isNotEmpty(receiptHeader.getOrigin()), ReceiptHeaderHistory::getOrigin, receiptHeader.getOrigin())
.eq(StringUtils.isNotEmpty(receiptHeader.getReceiptType()), ReceiptHeaderHistory::getReceiptType, receiptHeader.getReceiptType())
.like(StringUtils.isNotEmpty(receiptHeader.getCode()), ReceiptHeaderHistory::getCode, receiptHeader.getCode())
.eq(StringUtils.isNotEmpty(receiptHeader.getReferCode()), ReceiptHeaderHistory::getReferCode, receiptHeader.getReferCode())
- .eq(StringUtils.isNotNull(receiptHeader.getPushSuccessStatus()),ReceiptHeaderHistory::getPushSuccessStatus,receiptHeader.getPushSuccessStatus())
+ .eq(StringUtils.isNotNull(receiptHeader.getPushSuccessStatus()), ReceiptHeaderHistory::getPushSuccessStatus, receiptHeader.getPushSuccessStatus())
+ .like(StringUtils.isNotEmpty(receiptHeader.getReceiptNote()), ReceiptHeaderHistory::getReceiptNote, receiptHeader.getReceiptNote())
+ .like(StringUtils.isNotEmpty(receiptHeader.getMaterialColor()), ReceiptHeaderHistory::getMaterialColor, receiptHeader.getMaterialColor())
//.orderByAsc(ReceiptHeaderHistory::getLastUpdated)
//.orderByAsc(ReceiptHeaderHistory::getLastStatus)
.orderByDesc(ReceiptHeaderHistory::getLastUpdated);
- if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
+ if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)) {
/**
* 使用分页查询
*/
Page<ReceiptHeaderHistory> page = new Page<>(pageNum, pageSize);
IPage<ReceiptHeaderHistory> iPage = receiptHeaderHistoryService.page(page, lambdaQueryWrapper);
- return getMpDataTable(iPage.getRecords(),iPage.getTotal());
+ return getMpDataTable(iPage.getRecords(), iPage.getTotal());
} else {
list = receiptHeaderHistoryService.list(lambdaQueryWrapper);
}
@@ -113,13 +114,13 @@ public class ReceiptHeaderHistoryController extends BaseController {
/**
* 查询入库单
*/
- @ApiOperation(value="查询入库单 ", notes="查询入库单 ", httpMethod = "POST")
+ @ApiOperation(value = "查询入库单 ", notes = "查询入库单 ", httpMethod = "POST")
@RequiresPermissions("receipt:receiptDetail:add")
- @Log(title = "入库-入库单 ",operating = "查询入库单 ", action = BusinessType.OTHER)
+ @Log(title = "入库-入库单 ", operating = "查询入库单 ", action = BusinessType.OTHER)
@PostMapping("/getReceiptHeader")
@ResponseBody
public AjaxResult<ReceiptHeaderHistory> getReceiptHeader(String id) {
- if (StringUtils.isEmpty(id)){
+ if (StringUtils.isEmpty(id)) {
return AjaxResult.success("");
}
return AjaxResult.success(receiptHeaderHistoryService.getById(id));
diff --git a/src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html b/src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html
index 2ae1527..e0eefeb 100644
--- a/src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html
+++ b/src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html
@@ -40,6 +40,12 @@
物料规格：<input type="text" name="materialSpec"/>
</li>
<li>
+ 原仓库名称：<input type="text" name="warehouse"/>
+ </li>
+ <li>
+ 原仓库编码：<input type="text" name="warehouseName"/>
+ </li>
+ <li>
库存状态：
<select name="inventorySts" th:with="inventoryStatus=${@dict.getType('inventorySts')}">
<option value="">所有</option>
diff --git a/src/main/resources/templates/inventory/inventoryTransaction/inventoryTransaction.html b/src/main/resources/templates/inventory/inventoryTransaction/inventoryTransaction.html
index 42a4417..3f464a6 100644
--- a/src/main/resources/templates/inventory/inventoryTransaction/inventoryTransaction.html
+++ b/src/main/resources/templates/inventory/inventoryTransaction/inventoryTransaction.html
@@ -56,6 +56,12 @@
<li>
操作人：<input type="text" name="createdBy"/>
</li>
+ <li>
+ 原仓库名称：<input type="text" name="warehouse"/>
+ </li>
+ <li>
+ 原仓库编码：<input type="text" name="warehouseName"/>
+ </li>
<!-- <li>-->
<!-- 操作人工号：<input type="text" name="createdByNo"/>-->
<!-- </li>-->
diff --git a/src/main/resources/templates/receipt/receiptHeader/receiptHeader.html b/src/main/resources/templates/receipt/receiptHeader/receiptHeader.html
index b61c355..874f74a 100644
--- a/src/main/resources/templates/receipt/receiptHeader/receiptHeader.html
+++ b/src/main/resources/templates/receipt/receiptHeader/receiptHeader.html
@@ -85,6 +85,12 @@
调整单号：<input type="text" name="userDef3"/>
</li>
<li>
+ 入库单备注：<input type="text" name="receiptNote"/>
+ </li>
+ <li>
+ 颜色信息：<input type="text" name="materialColor"/>
+ </li>
+ <li>
MOM回传状态：<select id="pushSuccessStatus" name="pushSuccessStatus">
<option value="">所有</option>
<option value="0">未回传</option>
diff --git a/src/main/resources/templates/receipt/receiptHeaderHistory/receiptHeaderHistory.html b/src/main/resources/templates/receipt/receiptHeaderHistory/receiptHeaderHistory.html
index 9e410fb..6c2ec3c 100644
--- a/src/main/resources/templates/receipt/receiptHeaderHistory/receiptHeaderHistory.html
+++ b/src/main/resources/templates/receipt/receiptHeaderHistory/receiptHeaderHistory.html
@@ -85,6 +85,12 @@
调整单号：<input type="text" name="userDef3"/>
</li>
<li>
+ 入库单备注：<input type="text" name="receiptNote"/>
+ </li>
+ <li>
+ 颜色信息：<input type="text" name="materialColor"/>
+ </li>
+ <li>
MOM回传状态：<select id="pushSuccessStatus" name="pushSuccessStatus">
<option value="">所有</option>
<option value="0">未回传</option>
--
libgit2 0.22.2