From b0752dae29c4eadb96480d4c884c5badb9a66fb5 Mon Sep 17 00:00:00 2001
From: zzgtfwq <zzgtfwq>
Date: 星期二, 03 三月 2026 15:48:47 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MatController.java | 31 ++++++++++++++++++++++---------
1 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MatController.java b/src/main/java/com/zy/asrs/controller/MatController.java
index 9913f58..998d285 100644
--- a/src/main/java/com/zy/asrs/controller/MatController.java
+++ b/src/main/java/com/zy/asrs/controller/MatController.java
@@ -14,6 +14,7 @@
import com.zy.asrs.entity.MatPrint;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.entity.param.EmptyPlateOutParam;
+import com.zy.asrs.entity.param.MatSyncParam;
import com.zy.asrs.entity.result.KeyValueVo;
import com.zy.asrs.service.MatService;
import com.zy.asrs.utils.MatExcelListener;
@@ -58,16 +59,30 @@
return R.ok().add(mats);
}
+ @RequestMapping(value = "mat/sync")
+ @ManagerAuth
+ public R sync(@RequestBody MatSyncParam matSyncParam){
+ return matService.sync(matSyncParam);
+ }
+
+
+// @RequestMapping(value = "/mat/search/pda/auth")
+// @ManagerAuth
+// public R pdaSearch(@RequestParam(required = false)String condition){
+// EntityWrapper<Mat> wrapper = new EntityWrapper<>();
+// if (!Cools.isEmpty(condition)) {
+//// wrapper.like("matnr", condition).or().like("maktx", condition);
+// wrapper.like("matnr", condition).or().like("specs", condition);
+// }
+// wrapper.orderBy("create_time", false);
+// List<Mat> mats = matService.selectList(wrapper);
+// return R.ok().add(mats);
+// }
+
@RequestMapping(value = "/mat/search/pda/auth")
@ManagerAuth
public R pdaSearch(@RequestParam(required = false)String condition){
- EntityWrapper<Mat> wrapper = new EntityWrapper<>();
- if (!Cools.isEmpty(condition)) {
-// wrapper.like("matnr", condition).or().like("maktx", condition);
- wrapper.like("matnr", condition).or().like("specs", condition);
- }
- wrapper.orderBy("create_time", false);
- List<Mat> mats = matService.selectList(wrapper);
+ List<Mat> mats = matService.selectByMatnrLink10(condition);
return R.ok().add(mats);
}
@@ -231,8 +246,6 @@
}
OrderDetl orderDetl = new OrderDetl();
orderDetl.sync(mat);
- orderDetl.setStandby1(mat.getSupp());
- orderDetl.setStandby2(mat.getSku());
orderDetl.setAnfme(0.0D);
return R.ok().add(orderDetl);
}
--
Gitblit v1.9.1