From 1667372f02fb00dc76e172b5348c8e75ffb79bb9 Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期一, 10 五月 2021 16:58:45 +0800
Subject: [PATCH] 1.盘点出库状态工作任务不进行删除 2.托盘码为空不允许进行盘点出库
---
src/main/java/com/zy/asrs/controller/LocNormalController.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocNormalController.java b/src/main/java/com/zy/asrs/controller/LocNormalController.java
index 096887f..cb1c130 100644
--- a/src/main/java/com/zy/asrs/controller/LocNormalController.java
+++ b/src/main/java/com/zy/asrs/controller/LocNormalController.java
@@ -56,7 +56,7 @@
wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
}
if (Cools.isEmpty(param.get("state"))) {
- wrapper.eq("state", "1").or().eq("state", "2");
+ wrapper.in("state", "1,2");
}
return R.ok(locNormalService.selectPage(new Page<>(curr, limit), wrapper));
}
@@ -166,9 +166,9 @@
@RequestMapping(value = "/locNormal/pda/out/query")
@ManagerAuth(memo = "pda鍑哄簱鏌ヨ")
@Transactional
- public R locNormalPdaOutQuery(String matnr, String warehouse) {
+ public R locNormalPdaOutQuery(String matnr, String warehouse, String billNo) {
List<LocNormal> list = new ArrayList<>();
- list = locNormalService.pdaLocNormalQuery(matnr, warehouse);
+ list = locNormalService.pdaLocNormalQuery(matnr, warehouse, billNo);
return R.ok(list);
}
--
Gitblit v1.9.1