From 469d41fe09ceec3dc5259d01a4060aac1448e09f Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 03 九月 2025 09:59:34 +0800
Subject: [PATCH] 完善订单组托可用数据显示功能
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MatController.java | 98 +++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 91 insertions(+), 7 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MatController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MatController.java
index d3ac1d2..c00b5f1 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MatController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MatController.java
@@ -5,13 +5,8 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zy.asrs.common.utils.TreeUtils;
-import com.zy.asrs.common.wms.entity.LocDetl;
-import com.zy.asrs.common.wms.entity.LocMast;
-import com.zy.asrs.common.wms.entity.Mat;
-import com.zy.asrs.common.wms.entity.OrderDetl;
-import com.zy.asrs.common.wms.service.LocDetlService;
-import com.zy.asrs.common.wms.service.LocMastService;
-import com.zy.asrs.common.wms.service.MatService;
+import com.zy.asrs.common.wms.entity.*;
+import com.zy.asrs.common.wms.service.*;
import com.zy.asrs.framework.annotations.ManagerAuth;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.R;
@@ -35,6 +30,10 @@
private LocDetlService locDetlService;
@Autowired
private LocMastService locMastService;
+ @Autowired
+ private WrkMastService wrkMastService;
+ @Autowired
+ private WrkDetlService wrkDetlService;
@RequestMapping(value = "/mat/{id}/auth")
@ManagerAuth
@@ -194,6 +193,7 @@
}
OrderDetl orderDetl = new OrderDetl();
orderDetl.sync(mat);
+ orderDetl.setBatch("");
orderDetl.setAnfme(0.0D);
return R.ok().add(orderDetl);
}
@@ -242,4 +242,88 @@
return R.ok(locDetls);
}
+ @GetMapping("/mat/synchronous")
+ @ManagerAuth
+ public R synchronous(){
+ int wrkConut=wrkMastService.count(new LambdaQueryWrapper<WrkMast>());
+ if(wrkConut>0){
+ return R.error("鏈夊伐浣滀腑鐨勪换鍕欙紝绂佹鍚屾搴撳瓨淇℃伅");
+ }
+ List<Mat> mats=matService.list();
+ for (Mat mat:mats
+ ) {
+ List<LocDetl>locDetls=locDetlService.list(new LambdaQueryWrapper<LocDetl>()
+ .eq(LocDetl::getMatnr,mat.getMatnr()));
+ for (LocDetl locDetl:locDetls
+ ) {
+ locDetl.setMaktx(mat.getMaktx());
+
+ if(!Cools.isEmpty(mat.getSpecs())){
+ locDetl.setSpecs(mat.getSpecs());
+ }else{
+ locDetl.setSpecs("");
+ }
+ if(!Cools.isEmpty(mat.getModel())){
+ locDetl.setModel(mat.getModel());
+ }else {
+ locDetl.setModel("");
+ }
+ if(!Cools.isEmpty(mat.getSku())){
+ locDetl.setSku(mat.getSku());
+ }else {
+ locDetl.setSku("");
+ }
+ //鍥惧彿
+ if(!Cools.isEmpty(mat.getImgNum())){
+ locDetl.setItemNum(mat.getImgNum());
+ }else {
+ locDetl.setItemNum("");
+ }
+// if(!Cools.isEmpty(mat.getWeight())){
+// locDetl.setWeight(Double.parseDouble(mat.getWeight()));
+// }else {
+// locDetl.setWeight(0.0);
+// }
+// if(!Cools.isEmpty(mat.getLength())){
+// locDetl.setLength(Double.parseDouble(mat.getLength()));
+// }else {
+// locDetl.setLength(0.0);
+// }
+ locDetlService.updateById(locDetl);
+ }
+ }
+ return R.ok();
+ }
+
+ @PostMapping("/mat/sync")
+ @ManagerAuth
+ public R synchronous(@RequestBody Mat data) {
+ // 妫�鏌ユ槸鍚︽湁浠诲姟涓娇鐢ㄤ簡璇ョ墿鏂�
+ int wrkCount = wrkDetlService.count(new LambdaQueryWrapper<WrkDetl>()
+ .eq(WrkDetl::getMatnr, data.getMatnr()));
+ if (wrkCount > 0) {
+ return R.error("璇ョ墿鏂欐鍦ㄨ浠诲姟浣跨敤锛岀姝㈠悓姝�");
+ }
+
+ // 鏌ヨ瀵瑰簲搴撳瓨鏄庣粏
+ List<LocDetl> locDetls = locDetlService.list(
+ new LambdaQueryWrapper<LocDetl>().eq(LocDetl::getMatnr, data.getMatnr())
+ );
+
+ for (LocDetl locDetl : locDetls) {
+ locDetl.setMaktx(data.getMaktx());
+ locDetl.setSpecs(Cools.isEmpty(data.getSpecs()) ? "" : data.getSpecs());
+ locDetl.setModel(Cools.isEmpty(data.getModel()) ? "" : data.getModel());
+ locDetl.setSku(Cools.isEmpty(data.getSku()) ? "" : data.getSku());
+ locDetl.setItemNum(Cools.isEmpty(data.getImgNum()) ? "" : data.getImgNum());
+ // 鑻ラ渶瑕佸悓姝ラ噸閲忓拰闀垮害锛屽彇娑堟敞閲�
+ // locDetl.setWeight(Cools.isEmpty(data.getWeight()) ? 0.0 : Double.parseDouble(data.getWeight()));
+ // locDetl.setLength(Cools.isEmpty(data.getLength()) ? 0.0 : Double.parseDouble(data.getLength()));
+
+ locDetlService.updateById(locDetl);
+ }
+
+ return R.ok();
+ }
+
}
--
Gitblit v1.9.1