wms / wms_shandonghaiwang · Commits

Commit 773f59ebab9a56d34b02ece3914787979f7c5f3e

Authored by 易文鹏
1 parent a93ea800

feat: 模糊搜索

Inline Side-by-side
Showing 8 changed files with 50 additions and 17 deletions
src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java
  View file @773f59e
... ... @@ -108,6 +108,9 @@ public class InventoryDetailController extends BaseController {
108 108 .eq(StringUtils.isNotEmpty(inventoryDetail.getLockCode()), InventoryDetail::getLockCode, inventoryDetail.getLockCode())//库存锁
109 109 .eq(StringUtils.isNotEmpty(inventoryDetail.getZoneCode()), InventoryDetail::getZoneCode, inventoryDetail.getZoneCode()) //库区
110 110 .eq(StringUtils.isNotEmpty(inventoryDetail.getNoticeCode()), InventoryDetail::getNoticeCode, inventoryDetail.getNoticeCode()) //通知单号
  111 + .eq(StringUtils.isNotEmpty(inventoryDetail.getWarehouse()), InventoryDetail::getWarehouse, inventoryDetail.getWarehouse()) //原仓库编码
  112 + .like(StringUtils.isNotEmpty(inventoryDetail.getWarehouseName()), InventoryDetail::getWarehouseName, inventoryDetail.getWarehouseName()) //原仓库名称
  113 +
111 114  
112 115 //货主
113 116 .in(StringUtils.isNotEmpty(inventoryDetail.getCompanyCode()), InventoryDetail::getCompanyCode, inventoryDetail.getCompanyCode())
... ...
src/main/java/com/huaheng/pc/inventory/inventoryTransaction/controller/InventoryTransactionController.java
  View file @773f59e
... ... @@ -12,6 +12,7 @@ import com.huaheng.framework.web.controller.BaseController;
12 12 import com.huaheng.framework.web.page.PageDomain;
13 13 import com.huaheng.framework.web.page.TableDataInfo;
14 14 import com.huaheng.framework.web.page.TableSupport;
  15 +import com.huaheng.pc.inventory.inventoryDetail.domain.InventoryDetail;
15 16 import com.huaheng.pc.inventory.inventoryDetail.service.InventoryDetailService;
16 17 import com.huaheng.pc.inventory.inventoryHeader.service.InventoryHeaderService;
17 18 import com.huaheng.pc.inventory.inventoryTransaction.domain.InventoryTransaction;
... ... @@ -84,6 +85,8 @@ public class InventoryTransactionController extends BaseController {
84 85 //.notIn(InventoryTransaction::getTransactionType, 70, 80)
85 86 .eq(StringUtils.isNotEmpty(inventoryTransaction.getReferCode()), InventoryTransaction::getReferCode, inventoryTransaction.getReferCode())//上游单号
86 87 .like(StringUtils.isNotEmpty(inventoryTransaction.getCreatedBy()), InventoryTransaction::getCreatedBy, inventoryTransaction.getCreatedBy())//创建用户
  88 + .eq(StringUtils.isNotEmpty(inventoryTransaction.getWarehouse()), InventoryTransaction::getWarehouse, inventoryTransaction.getWarehouse()) //原仓库编码
  89 + .like(StringUtils.isNotEmpty(inventoryTransaction.getWarehouseName()), InventoryTransaction::getWarehouseName, inventoryTransaction.getWarehouseName()) //原仓库名称
87 90 //货主
88 91 .in(InventoryTransaction::getCompanyCode, ShiroUtils.getCompanyCodeList())
89 92 .orderByDesc(InventoryTransaction::getId);
... ...
src/main/java/com/huaheng/pc/receipt/receiptHeader/controller/ReceiptHeaderController.java
  View file @773f59e
... ... @@ -110,6 +110,8 @@ public class ReceiptHeaderController extends BaseController {
110 110 .inSql(StringUtils.isNotNull(receiptHeader.getNoticeNo()) && StringUtils.isNotEmpty(receiptHeader.getNoticeNo()), ReceiptHeader::getId, "select receiptId from receipt_detail where noticeNo like '%" + receiptHeader.getNoticeNo() + "%'")
111 111 .eq(StringUtils.isNotEmpty(receiptHeader.getReceiptType()), ReceiptHeader::getReceiptType, receiptHeader.getReceiptType())
112 112 .like(StringUtils.isNotEmpty(receiptHeader.getCode()), ReceiptHeader::getCode, receiptHeader.getCode())
  113 + .like(StringUtils.isNotEmpty(receiptHeader.getReceiptNote()), ReceiptHeader::getReceiptNote, receiptHeader.getReceiptNote())
  114 + .like(StringUtils.isNotEmpty(receiptHeader.getMaterialColor()), ReceiptHeader::getMaterialColor, receiptHeader.getMaterialColor())
113 115 .eq(StringUtils.isNotEmpty(receiptHeader.getReferCode()), ReceiptHeader::getReferCode, receiptHeader.getReferCode())
114 116 .eq(StringUtils.isNotNull(receiptHeader.getPushSuccessStatus()), ReceiptHeader::getPushSuccessStatus, receiptHeader.getPushSuccessStatus())
115 117 .orderByAsc(ReceiptHeader::getLastStatus)
... ...
src/main/java/com/huaheng/pc/receipt/receiptHeaderHistory/controller/ReceiptHeaderHistoryController.java
  View file @773f59e
... ... @@ -37,15 +37,14 @@ import java.util.List;
37 37 @RequestMapping("/receipt/receiptHeaderHistory")
38 38 public class ReceiptHeaderHistoryController extends BaseController {
39 39  
40   - private String prefix="receipt/receiptHeaderHistory";
  40 + private String prefix = "receipt/receiptHeaderHistory";
41 41  
42 42 @Resource
43 43 private ReceiptHeaderHistoryService receiptHeaderHistoryService;
44 44  
45 45 @RequiresPermissions("receipt:receiptHeaderHistory:view")
46 46 @GetMapping()
47   - public String containerCapacity()
48   - {
  47 + public String containerCapacity() {
49 48 return prefix + "/receiptHeaderHistory";
50 49 }
51 50  
... ... @@ -56,7 +55,7 @@ public class ReceiptHeaderHistoryController extends BaseController {
56 55 @Log(title = "入库-入库单头表", operating = "查看入库单列表", action = BusinessType.GRANT)
57 56 @PostMapping("/list")
58 57 @ResponseBody
59   - public TableDataInfo list(@ApiParam(name="receiptDetail",value="入库头表") ReceiptHeaderHistory receiptHeader,
  58 + public TableDataInfo list(@ApiParam(name = "receiptDetail", value = "入库头表") ReceiptHeaderHistory receiptHeader,
60 59 @ApiParam(name = "createdBegin", value = "起止时间") String createdBegin,
61 60 @ApiParam(name = "createdEnd", value = "结束时间") String createdEnd,
62 61 Integer statusFirst, Integer statusLast) {
... ... @@ -66,44 +65,46 @@ public class ReceiptHeaderHistoryController extends BaseController {
66 65 Integer pageSize = pageDomain.getPageSize();
67 66 List<ReceiptHeaderHistory> list = new ArrayList<>();
68 67  
69   - if (QuantityConstant.HEADER_STATE.equals(receiptHeader.getLastStatus())){
  68 + if (QuantityConstant.HEADER_STATE.equals(receiptHeader.getLastStatus())) {
70 69 lambdaQueryWrapper.le(ReceiptHeaderHistory::getLastStatus, receiptHeader.getLastStatus());
71   - }else {
  70 + } else {
72 71 lambdaQueryWrapper.eq(StringUtils.isNotNull(receiptHeader.getLastStatus()),
73 72 ReceiptHeaderHistory::getLastStatus, receiptHeader.getLastStatus());
74 73 }
75   - if (QuantityConstant.HEADER_STATE.equals(receiptHeader.getFirstStatus())){
  74 + if (QuantityConstant.HEADER_STATE.equals(receiptHeader.getFirstStatus())) {
76 75 lambdaQueryWrapper.le(ReceiptHeaderHistory::getFirstStatus, receiptHeader.getFirstStatus());
77   - }else {
  76 + } else {
78 77 lambdaQueryWrapper.eq(StringUtils.isNotNull(receiptHeader.getFirstStatus()),
79 78 ReceiptHeaderHistory::getFirstStatus, receiptHeader.getFirstStatus());
80 79 }
81 80 lambdaQueryWrapper.ge(StringUtils.isNotEmpty(createdBegin), ReceiptHeaderHistory::getCreated, createdBegin)
82 81 .le(StringUtils.isNotEmpty(createdEnd), ReceiptHeaderHistory::getCreated, createdEnd)
83   - .in(StringUtils.isNotEmpty(receiptHeader.getCompanyCode()),ReceiptHeaderHistory::getCompanyCode, receiptHeader.getCompanyCode())
  82 + .in(StringUtils.isNotEmpty(receiptHeader.getCompanyCode()), ReceiptHeaderHistory::getCompanyCode, receiptHeader.getCompanyCode())
84 83 .in(StringUtils.isEmpty(receiptHeader.getCompanyCode()), ReceiptHeaderHistory::getCompanyCode, ShiroUtils.getCompanyCodeList())
85 84 .like(StringUtils.isNotEmpty(receiptHeader.getLastUpdatedBy()), ReceiptHeaderHistory::getLastUpdatedBy, receiptHeader.getLastUpdatedBy())
86 85 .in(StringUtils.isEmpty(receiptHeader.getCompanyCode()), ReceiptHeaderHistory::getCompanyCode, ShiroUtils.getCompanyCodeList())
87 86 .like(StringUtils.isNotEmpty(receiptHeader.getUserDef3()), ReceiptHeaderHistory::getUserDef3, receiptHeader.getUserDef3())
88 87 .eq(ReceiptHeaderHistory::getWarehouseCode, ShiroUtils.getWarehouseCode())
89   - .inSql(StringUtils.isNotNull(receiptHeader.getSNNO()) && StringUtils.isNotEmpty(receiptHeader.getSNNO()),ReceiptHeaderHistory::getId, "select receiptId from receipt_detail_history where attribute4 like '%"+receiptHeader.getSNNO()+"%'")
90   - .inSql(StringUtils.isNotNull(receiptHeader.getNoticeNo()) && StringUtils.isNotEmpty(receiptHeader.getNoticeNo()),ReceiptHeaderHistory::getId, "select receiptId from receipt_detail_history where noticeNo like '%"+receiptHeader.getNoticeNo()+"%'")
  88 + .inSql(StringUtils.isNotNull(receiptHeader.getSNNO()) && StringUtils.isNotEmpty(receiptHeader.getSNNO()), ReceiptHeaderHistory::getId, "select receiptId from receipt_detail_history where attribute4 like '%" + receiptHeader.getSNNO() + "%'")
  89 + .inSql(StringUtils.isNotNull(receiptHeader.getNoticeNo()) && StringUtils.isNotEmpty(receiptHeader.getNoticeNo()), ReceiptHeaderHistory::getId, "select receiptId from receipt_detail_history where noticeNo like '%" + receiptHeader.getNoticeNo() + "%'")
91 90 .like(StringUtils.isNotEmpty(receiptHeader.getOrigin()), ReceiptHeaderHistory::getOrigin, receiptHeader.getOrigin())
92 91 .eq(StringUtils.isNotEmpty(receiptHeader.getReceiptType()), ReceiptHeaderHistory::getReceiptType, receiptHeader.getReceiptType())
93 92 .like(StringUtils.isNotEmpty(receiptHeader.getCode()), ReceiptHeaderHistory::getCode, receiptHeader.getCode())
94 93 .eq(StringUtils.isNotEmpty(receiptHeader.getReferCode()), ReceiptHeaderHistory::getReferCode, receiptHeader.getReferCode())
95   - .eq(StringUtils.isNotNull(receiptHeader.getPushSuccessStatus()),ReceiptHeaderHistory::getPushSuccessStatus,receiptHeader.getPushSuccessStatus())
  94 + .eq(StringUtils.isNotNull(receiptHeader.getPushSuccessStatus()), ReceiptHeaderHistory::getPushSuccessStatus, receiptHeader.getPushSuccessStatus())
  95 + .like(StringUtils.isNotEmpty(receiptHeader.getReceiptNote()), ReceiptHeaderHistory::getReceiptNote, receiptHeader.getReceiptNote())
  96 + .like(StringUtils.isNotEmpty(receiptHeader.getMaterialColor()), ReceiptHeaderHistory::getMaterialColor, receiptHeader.getMaterialColor())
96 97 //.orderByAsc(ReceiptHeaderHistory::getLastUpdated)
97 98 //.orderByAsc(ReceiptHeaderHistory::getLastStatus)
98 99 .orderByDesc(ReceiptHeaderHistory::getLastUpdated);
99 100  
100   - if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
  101 + if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)) {
101 102 /**
102 103 * 使用分页查询
103 104 */
104 105 Page<ReceiptHeaderHistory> page = new Page<>(pageNum, pageSize);
105 106 IPage<ReceiptHeaderHistory> iPage = receiptHeaderHistoryService.page(page, lambdaQueryWrapper);
106   - return getMpDataTable(iPage.getRecords(),iPage.getTotal());
  107 + return getMpDataTable(iPage.getRecords(), iPage.getTotal());
107 108 } else {
108 109 list = receiptHeaderHistoryService.list(lambdaQueryWrapper);
109 110 }
... ... @@ -113,13 +114,13 @@ public class ReceiptHeaderHistoryController extends BaseController {
113 114 /**
114 115 * 查询入库单
115 116 */
116   - @ApiOperation(value="查询入库单 ", notes="查询入库单 ", httpMethod = "POST")
  117 + @ApiOperation(value = "查询入库单 ", notes = "查询入库单 ", httpMethod = "POST")
117 118 @RequiresPermissions("receipt:receiptDetail:add")
118   - @Log(title = "入库-入库单 ",operating = "查询入库单 ", action = BusinessType.OTHER)
  119 + @Log(title = "入库-入库单 ", operating = "查询入库单 ", action = BusinessType.OTHER)
119 120 @PostMapping("/getReceiptHeader")
120 121 @ResponseBody
121 122 public AjaxResult<ReceiptHeaderHistory> getReceiptHeader(String id) {
122   - if (StringUtils.isEmpty(id)){
  123 + if (StringUtils.isEmpty(id)) {
123 124 return AjaxResult.success("");
124 125 }
125 126 return AjaxResult.success(receiptHeaderHistoryService.getById(id));
... ...
src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html
  View file @773f59e
... ... @@ -40,6 +40,12 @@
40 40 物料规格：<input type="text" name="materialSpec"/>
41 41 </li>
42 42 <li>
  43 + 原仓库名称：<input type="text" name="warehouse"/>
  44 + </li>
  45 + <li>
  46 + 原仓库编码：<input type="text" name="warehouseName"/>
  47 + </li>
  48 + <li>
43 49 库存状态：
44 50 <select name="inventorySts" th:with="inventoryStatus=${@dict.getType('inventorySts')}">
45 51 <option value="">所有</option>
... ...
src/main/resources/templates/inventory/inventoryTransaction/inventoryTransaction.html
  View file @773f59e
... ... @@ -56,6 +56,12 @@
56 56 <li>
57 57 操作人：<input type="text" name="createdBy"/>
58 58 </li>
  59 + <li>
  60 + 原仓库名称：<input type="text" name="warehouse"/>
  61 + </li>
  62 + <li>
  63 + 原仓库编码：<input type="text" name="warehouseName"/>
  64 + </li>
59 65 <!-- <li>-->
60 66 <!-- 操作人工号：<input type="text" name="createdByNo"/>-->
61 67 <!-- </li>-->
... ...
src/main/resources/templates/receipt/receiptHeader/receiptHeader.html
  View file @773f59e
... ... @@ -85,6 +85,12 @@
85 85 调整单号：<input type="text" name="userDef3"/>
86 86 </li>
87 87 <li>
  88 + 入库单备注：<input type="text" name="receiptNote"/>
  89 + </li>
  90 + <li>
  91 + 颜色信息：<input type="text" name="materialColor"/>
  92 + </li>
  93 + <li>
88 94 MOM回传状态：<select id="pushSuccessStatus" name="pushSuccessStatus">
89 95 <option value="">所有</option>
90 96 <option value="0">未回传</option>
... ...
src/main/resources/templates/receipt/receiptHeaderHistory/receiptHeaderHistory.html
  View file @773f59e
... ... @@ -85,6 +85,12 @@
85 85 调整单号：<input type="text" name="userDef3"/>
86 86 </li>
87 87 <li>
  88 + 入库单备注：<input type="text" name="receiptNote"/>
  89 + </li>
  90 + <li>
  91 + 颜色信息：<input type="text" name="materialColor"/>
  92 + </li>
  93 + <li>
88 94 MOM回传状态：<select id="pushSuccessStatus" name="pushSuccessStatus">
89 95 <option value="">所有</option>
90 96 <option value="0">未回传</option>
... ...