From ed72baa5f60f2d86cc58799ce96c658321a54d79 Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期五, 30 四月 2021 13:53:54 +0800
Subject: [PATCH] 1.erp立库出库对接 2.erp平仓出库对接
---
src/main/java/com/zy/asrs/controller/LocDetlController.java | 34 +++++++++++++++++++++++++++++-----
1 files changed, 29 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index 020b83c..526274e 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -68,6 +68,14 @@
param.remove("modi_time");
}
}
+ /* 閫氱煡鍗曞彿涓虹┖锛屽垹闄ゅ叆鍙傞�氱煡鍗曞彿supplier */
+ if (Cools.isEmpty(param.get("supplier"))) {
+ param.remove("supplier");
+ }
+ /* 鐢熶骇鍗曞彿涓虹┖锛屽垹闄ょ敓浜у崟鍙穡arehouse */
+ if (Cools.isEmpty(param.get("mnemonic"))) {
+ param.remove("mnemonic");
+ }
return R.ok(locDetlService.getStockOut(toPage(curr, limit, param, LocDetl.class)));
}
@@ -79,8 +87,13 @@
@RequestParam(required = false)String orderByType,
@RequestParam(required = false)String condition,
@RequestParam Map<String, Object> param){
+
excludeTrash(param);
EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
+ if ("0".equals(param.get("mat_status"))) {
+ wrapper.isNull("mat_status");
+ param.remove("mat_status");
+ }
convert(param, wrapper);
allLike(LocDetl.class, param.keySet(), wrapper, condition);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
@@ -179,13 +192,24 @@
/**
* 鎵归噺淇敼鐗╂枡鐘舵��
- * @param loc_no
- * @param matnr
* @return
*/
@RequestMapping(value = "/locDetl/getAllLocDetlData")
- @ManagerAuth
- public List<LocDetl> getAllLocDetlData(String loc_no, String matnr, String matStatusFlag) {
- return locDetlService.getAllLocDetlData(loc_no, matnr, matStatusFlag);
+ @ManagerAuth(memo = "鎵归噺淇敼鐗╂枡鐘舵��")
+ public R getAllLocDetlData(@RequestBody JSONObject param) {
+ List<LocDetl> list = JSONObject.parseArray(param.getJSONArray("list").toJSONString(), LocDetl.class);
+ Integer result = locDetlService.getAllLocDetlData(list);
+ return R.ok().add(result);
+ }
+
+ /**
+ * 鏌ヨ鎬诲簱瀛橈紙绔嬪簱+骞充粨锛�
+ */
+ @RequestMapping(value = "/locDetl/queryAllMatDetl")
+ @ManagerAuth(memo = "鏌ヨ鎬诲簱瀛�")
+ public R queryAllMatDetl(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "10")Integer limit,
+ @RequestParam Map<String, Object> param) {
+ return R.ok(locDetlService.queryAllMatDetl(toPage(curr, limit, param, LocDetl.class)));
}
}
--
Gitblit v1.9.1