From 8d75c94e04af3d56c0de713e3120d14dfef73083 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期一, 29 九月 2025 13:40:29 +0800
Subject: [PATCH] #和得服务器
---
src/main/java/com/zy/asrs/controller/MatController.java | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MatController.java b/src/main/java/com/zy/asrs/controller/MatController.java
index e79b7e8..9913f58 100644
--- a/src/main/java/com/zy/asrs/controller/MatController.java
+++ b/src/main/java/com/zy/asrs/controller/MatController.java
@@ -140,9 +140,11 @@
if (Cools.isEmpty(mat) || null==mat.getId()){
return R.error();
}
+ String oldMatnr = matService.getOldMatnr(mat.getId());
mat.setUpdateBy(getUserId());
mat.setUpdateTime(new Date());
matService.updateById(mat);
+
return R.ok();
}
@@ -167,13 +169,6 @@
@RequestParam(defaultValue = "10")Integer limit,
@RequestParam Map<String, Object> param){
return R.ok(matService.getMatTurnPage(toPage(curr, limit, param, Mat.class)));
- }
-
- @RequestMapping("/mat/turn/over/out/start")
- @ManagerAuth(memo = "鍝佸彿绉讳氦")
- public R turnOverOutStart(@RequestBody EmptyPlateOutParam param) {
-
- return R.ok("鍝佸彿绉讳氦鎴愬姛");
}
@RequestMapping("/mat/turn/over/take/site")
@@ -236,6 +231,8 @@
}
OrderDetl orderDetl = new OrderDetl();
orderDetl.sync(mat);
+ orderDetl.setStandby1(mat.getSupp());
+ orderDetl.setStandby2(mat.getSku());
orderDetl.setAnfme(0.0D);
return R.ok().add(orderDetl);
}
@@ -281,6 +278,8 @@
print.setBarcode(mat.getBarcode());
print.setMaktx(mat.getMaktx());
print.setSpecs(mat.getSpecs());
+ print.setSupp(mat.getSupp());
+ print.setSku(mat.getSku());
print.setUnit(mat.getUnit());
print.setMemo(mat.getMemo());
res.add(print);
--
Gitblit v1.9.1