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 | 29 +++++++++++++++++++++++++++++
1 files changed, 29 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MatController.java b/src/main/java/com/zy/asrs/controller/MatController.java
index e1fb0d2..9913f58 100644
--- a/src/main/java/com/zy/asrs/controller/MatController.java
+++ b/src/main/java/com/zy/asrs/controller/MatController.java
@@ -13,6 +13,7 @@
import com.zy.asrs.entity.Mat;
import com.zy.asrs.entity.MatPrint;
import com.zy.asrs.entity.OrderDetl;
+import com.zy.asrs.entity.param.EmptyPlateOutParam;
import com.zy.asrs.entity.result.KeyValueVo;
import com.zy.asrs.service.MatService;
import com.zy.asrs.utils.MatExcelListener;
@@ -139,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();
}
@@ -158,6 +161,28 @@
}
}
return R.ok();
+ }
+
+ @RequestMapping(value = "/mat/turn/over/list/auth")
+ @ManagerAuth
+ public R turnOverList(@RequestParam(defaultValue = "1")Integer curr,
+ @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/take/site")
+ @ManagerAuth()
+ public R availableTakeSite(@RequestParam(required = false) String matnr){
+ List<Map<String, Object>> result = new ArrayList<>();
+ List<Mat> mats = matService.selectByMatnrLink(matnr);
+ for (Mat mat : mats) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("siteId", mat.getId());
+ map.put("desc", mat.getMatnr());
+ result.add(map);
+ }
+ return R.ok().add(result);
}
@RequestMapping(value = "/mat/export/auth")
@@ -206,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);
}
@@ -251,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