From c7ba417c5fb7cdf98671b237201c91a2d4cc45bc Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期二, 25 五月 2021 13:45:24 +0800
Subject: [PATCH] 1.库存调整(往StockCheckRecord插入盘盈、盘亏数据) 2.手动入库(无通知单号)往CPICMO插入数据,FWorkShop(部门)值erp提供[11378]
---
src/main/java/com/zy/asrs/controller/LocNormalController.java | 35 +++++++++++++++++++++++++++++------
1 files changed, 29 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocNormalController.java b/src/main/java/com/zy/asrs/controller/LocNormalController.java
index 64d82cc..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));
}
@@ -103,7 +103,7 @@
public void updateLocNormal(LocNormal param) {
Long modiUser = getUserId();
Date modiTime = new Date();
- locNormalService.updateLocNormal(param.getMatnr(), param.getAnfme(), modiUser, modiTime);
+ locNormalService.updateLocNormal(param.getMatnr(), param.getAnfme(), modiUser, modiTime, param.getId());
}
@RequestMapping(value = "/locNormal/outLoc/auth")
@@ -111,7 +111,7 @@
public void outLocNormal(LocNormal param) {
Long modiUser = getUserId();
Date modiTime = new Date();
- locNormalService.outLocNormal(param.getMatnr(), modiUser, modiTime);
+ locNormalService.outLocNormal(param.getMatnr(), modiUser, modiTime, param.getId());
}
@RequestMapping(value = "/locNormal/removeLoc/auth")
@@ -119,7 +119,7 @@
public void removeLoc(LocNormal param) {
Long modiUser = getUserId();
Date modiTime = new Date();
- locNormalService.removeLocNormal(param.getMatnr(), modiUser, modiTime);
+ locNormalService.removeLocNormal(param.getMatnr(), modiUser, modiTime, param.getId());
}
/* 瀵煎叆 */
@@ -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);
}
@@ -186,4 +186,27 @@
locNormalService.pdaLocNormalOut(list);
return R.ok();
}
+
+ @RequestMapping(value = "/locNormal/pda/warehouseQuery")
+ @ManagerAuth(memo = "pda鏍规嵁搴撳尯鏌ヨ鐗╂枡娓呭崟")
+ @Transactional
+ public R locNormalPdaWarehouseQuery(String warehouse, String matnr) {
+ List<LocNormal> list = locNormalService.pdaLocNormalWarehouseQuery(warehouse, matnr);
+ return R.ok(list);
+ }
+
+ @RequestMapping(value = "/locNormal/pda/move")
+ @ManagerAuth(memo = "pda绉诲簱")
+ @Transactional
+ public R LocNormalPdaMove(@RequestBody LocNormalParam param) {
+ Long userId = getUserId();
+ Date timeNow = new Date();
+ List<LocNormal> list = param.getNormalList();
+ for (Integer i = 0; i < list.size(); i++) {
+ list.get(i).setModiUser(userId);
+ list.get(i).setModiTime(timeNow);
+ }
+ locNormalService.pdaLocNormalMove(list);
+ return R.ok();
+ }
}
--
Gitblit v1.9.1