From 34ec30feb82e27c500d0619820259394c8d25919 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期二, 19 九月 2023 16:28:49 +0800
Subject: [PATCH] Merge branch 'tzskasrs' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs
---
src/main/java/com/zy/asrs/controller/MobileController.java | 31 +++++++++++++++++++++++++++++++
1 files changed, 31 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index d712978..1d05c39 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -47,6 +47,8 @@
private BasDevpService basDevpService;
@Autowired
private PackService packService;
+ @Autowired
+ private ManLocDetlService manLocDetlService;
// 缁勬墭 ----------------------------------------------------------------------------------------------------
@@ -88,6 +90,8 @@
combMat.setAnfme(orderDetl.getAnfme()-orderDetl.getQty());
combMat.setMaktx(orderDetl.getMaktx());
combMat.setSpecs(orderDetl.getSpecs());
+ combMat.setCsocode(orderDetl.getColor());
+ combMat.setIsoseq(orderDetl.getOrigin());
combMats.add(combMat);
}
combParam.setCombMats(combMats);
@@ -318,5 +322,32 @@
return R.ok("鐩樼偣鎴愬姛");
}
+ /*
+ 骞冲簱 搴撲綅鎺ㄨ崘
+ */
+ @RequestMapping("/node/recommend/loc")
+ @ManagerAuth(memo = "搴撲綅鎺ㄨ崘")
+ public R recommendNodeLoc(){
+
+
+ return R.ok();
+ }
+
+ /*
+ 骞冲簱 璁㈠崟涓婃灦
+ */
+ @RequestMapping("/node/puttway")
+ @ManagerAuth(memo = "璁㈠崟涓婃灦")
+ public R putway(@RequestBody HashMap<String,String> params){
+ String zpallet = params.get("zpallet");
+ String locNo = params.get("locNo");
+
+ mobileService.nodePutway(zpallet,locNo,getUser());
+
+
+ return R.ok();
+ }
+
+
}
--
Gitblit v1.9.1