From f3ce4485cd37eb7c3bcf16fde86a7f149974c4b6 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期五, 20 三月 2026 09:51:50 +0800
Subject: [PATCH] #检查导出功能： 1.商品档案无异常 2.库存明细管理（异常）已修复 3.库存明细统计无异常 4.工作档查询维护无异常 5.工作档明细查询无异常 6.工作历史档查询无异常 7.工作明细历史档查询无异常 8.入库通知历史档无异常 9.库存移动流水记录（异常）已修复 10.机台工位绑定无异常 11.库存调整记录无异常 12.工作档维护日志（异常）已修复 13.操作日志无异常
---
src/main/java/com/zy/asrs/controller/WaitPakinController.java | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WaitPakinController.java b/src/main/java/com/zy/asrs/controller/WaitPakinController.java
index f6a89be..be214b9 100644
--- a/src/main/java/com/zy/asrs/controller/WaitPakinController.java
+++ b/src/main/java/com/zy/asrs/controller/WaitPakinController.java
@@ -81,13 +81,32 @@
}
@RequestMapping(value = "/waitPakin/update/auth")
- @ManagerAuth
+ @ManagerAuth
public R update(WaitPakin waitPakin){
if (Cools.isEmpty(waitPakin)){
return R.error();
}
waitPakinService.updateById(waitPakin);
return R.ok();
+ }
+
+ @RequestMapping(value = "/waitPakin/update/beBatch/auth")
+ @ManagerAuth
+ public R updateBeBatch(@RequestBody Map<String, Object> param) {
+ String zpallet = (String) param.get("zpallet");
+ Integer beBatch = Integer.parseInt(param.get("beBatch").toString());
+
+ if (Cools.isEmpty(zpallet)) {
+ return R.error("鎵樼洏鐮佷笉鑳戒负绌�");
+ }
+
+ boolean result = waitPakinService.updateBeBatchByZpallet(zpallet, beBatch);
+
+ if (result) {
+ return R.ok("淇敼鎴愬姛");
+ } else {
+ return R.error("淇敼澶辫触");
+ }
}
@RequestMapping(value = "/waitPakin/delete/auth")
@@ -109,7 +128,10 @@
// if (!orderDetlService.decrease(entity.getOrderNo(), entity.getMatnr(), entity.getBatch(), entity.getAnfme())) {
// return R.error("璁㈠崟鏁版嵁鍥炴粴澶辫触");
// }
- OrderInAndOutUtil.decrease(Boolean.TRUE, entity.getOrderNo(), entity.getMatnr(), entity.getBatch(),entity.getBrand(),entity.getStandby1(),entity.getStandby2(),entity.getStandby3(), entity.getAnfme());
+ OrderInAndOutUtil.decrease(Boolean.TRUE, entity.getOrderNo(), entity.getMatnr(), entity.getBatch(),entity.getBrand()
+ ,entity.getStandby1(),entity.getStandby2(),entity.getStandby3()
+ ,entity.getBoxType1(),entity.getBoxType2(),entity.getBoxType3()
+ , entity.getAnfme());
}
}
return R.ok();
--
Gitblit v1.9.1