From a3bea567c554c2c57809ceed2a040baf473aa95f Mon Sep 17 00:00:00 2001
From: cp <513960435@qq.com>
Date: 星期四, 27 三月 2025 13:04:38 +0800
Subject: [PATCH] 1
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MatController.java | 61 ++++++++++++++++++++++++++++--
1 files changed, 57 insertions(+), 4 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..810e5d9 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,11 @@
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.entity.*;
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.service.WrkMastService;
import com.zy.asrs.framework.annotations.ManagerAuth;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.R;
@@ -35,6 +33,8 @@
private LocDetlService locDetlService;
@Autowired
private LocMastService locMastService;
+ @Autowired
+ private WrkMastService wrkMastService;
@RequestMapping(value = "/mat/{id}/auth")
@ManagerAuth
@@ -194,6 +194,7 @@
}
OrderDetl orderDetl = new OrderDetl();
orderDetl.sync(mat);
+ orderDetl.setBatch("");
orderDetl.setAnfme(0.0D);
return R.ok().add(orderDetl);
}
@@ -242,4 +243,56 @@
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();
+ }
}
--
Gitblit v1.9.1