Commit 08b9b467df54ee7549e3bd9c360fb241dc4de0a6
1 parent
e3017891
将昆山采购入库单里面的产成品入库单隐藏
Showing
2 changed files
with
12 additions
and
2 deletions
src/main/java/com/huaheng/pc/config/receiptType/service/ReceiptTypeServiceImpl.java
... | ... | @@ -25,6 +25,16 @@ public class ReceiptTypeServiceImpl extends ServiceImpl<ReceiptTypeMapper, Recei |
25 | 25 | return list; |
26 | 26 | } |
27 | 27 | |
28 | + public List<Map<String, Object>> getHideType(){ | |
29 | + LambdaQueryWrapper<ReceiptType> lambdaQueryWrapper = Wrappers.lambdaQuery(); | |
30 | + lambdaQueryWrapper.eq(StringUtils.isNotEmpty(ShiroUtils.getWarehouseCode()),ReceiptType::getWarehouseCode, ShiroUtils.getWarehouseCode()) | |
31 | + .in(StringUtils.isNotEmpty(ShiroUtils.getCompanyCodeList()),ReceiptType::getCompanyCode, ShiroUtils.getCompanyCodeList()) | |
32 | + .ne(ShiroUtils.getWarehouseCode().equals("KS0001"),ReceiptType::getCode,"SI") | |
33 | + .eq(ReceiptType::getEnable,true); | |
34 | + List<Map<String, Object>> list = this.listMaps(lambdaQueryWrapper); | |
35 | + return list; | |
36 | + } | |
37 | + | |
28 | 38 | /** |
29 | 39 | * 复制入库类型表 |
30 | 40 | * |
... | ... |
src/main/resources/templates/receipt/receiptHeader/receiptHeader.html
... | ... | @@ -36,7 +36,7 @@ |
36 | 36 | 入库单号:<input type="text" name="code"/> |
37 | 37 | </li> |
38 | 38 | <li> |
39 | - 入库类型:<select name="receiptType" th:with="type=${@receiptTypeService.getType()}" id="receiptType"> | |
39 | + 入库类型:<select name="receiptType" th:with="type=${@receiptTypeService.getHideType()}" id="receiptType"> | |
40 | 40 | <option value="">所有</option> |
41 | 41 | <option th:each="e : ${type}" th:text="${e['name']}" th:value="${e['code']}"></option></select> |
42 | 42 | </li> |
... | ... | @@ -243,7 +243,7 @@ |
243 | 243 | var prefix = ctx + "receipt/receiptHeader"; |
244 | 244 | var detailPrefix = ctx + "receipt/receiptDetail"; |
245 | 245 | var datas = [[${@dict.getType('sys_normal_disable')}]]; |
246 | - var receiptTypes = [[${@receiptTypeService.getType()}]]; | |
246 | + var receiptTypes = [[${@receiptTypeService.getHideType()}]]; | |
247 | 247 | var receiptHeaderStatus = [[${@dict.getType('receiptHeaderStatus')}]]; |
248 | 248 | var uploadStatus = [[${@dict.getType('uploadStatus')}]]; |
249 | 249 | var company =[[${@companyService.getCode()}]]; |
... | ... |