From 9a04d9fbbb52a3fd93cf5fae359000c6a4fd419b Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期二, 09 四月 2024 13:38:38 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MobileController.java | 30 ++++++++++++++++++++++++++----
1 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 01339ec..8a36e05 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -429,7 +429,7 @@
JSONArray jsonArray = JSONArray.parseArray(json.getJSONArray("pla").toJSONString());
for (Object o : jsonArray){
JSONObject jsonObject = (JSONObject)o;
- String brand = json.get("brand").toString();
+ String brand = jsonObject.get("brand").toString();
String batch = jsonObject.get("batch").toString();
Integer packageNo = Integer.parseInt(jsonObject.get("packageNo").toString());
if(Cools.isEmpty(locNo) || Cools.isEmpty(batch) || Cools.isEmpty(packageNo)){
@@ -456,12 +456,13 @@
String orderDetlId = json.get("orderDetlId").toString();
String wrkNo = json.get("wrkNo").toString();
Double anfme = Double.parseDouble(json.get("anfme").toString());
+ boolean isReplace = Cools.eq(json.get("replace").toString(),"y");
if(Cools.isEmpty(locNo) || Cools.isEmpty(batch) || Cools.isEmpty(packageNo)){
return R.error("鏈夊弬鏁颁负绌猴紝鏃犳硶鍏ュ簱");
}
- mobileService.plaPakout(brand,locNo,batch,packageNo,orderNo,orderDetlId,wrkNo,anfme);
+ mobileService.plaPakout(brand,locNo,batch,packageNo,orderNo,orderDetlId,wrkNo,anfme,isReplace);
return R.ok();
}
@@ -473,15 +474,30 @@
String batch = json.get("batch").toString();
Integer packageNo = Integer.parseInt(json.get("packageNo").toString());
String orderNo = json.get("orderNo").toString();
- String orderDetlId = json.get("orderDetlId").toString();
+ String plaQtyId = json.get("orderDetlId").toString();
String wrkNo = json.get("wrkNo").toString();
Double anfme = Double.parseDouble(json.get("anfme").toString());
+ boolean isReplace = !Cools.isEmpty(json.get("replace")) && Cools.eq(json.get("replace").toString(),"y");
if(Cools.isEmpty(locNo) || Cools.isEmpty(batch) || Cools.isEmpty(packageNo)){
return R.error("鏈夊弬鏁颁负绌猴紝鏃犳硶鍏ュ簱");
}
- mobileService.plaPakout(brand,locNo,batch,packageNo,orderNo,orderDetlId,wrkNo,anfme);
+ mobileService.plaPakout(brand,locNo,batch,packageNo,orderNo,plaQtyId,wrkNo,anfme,isReplace);
+ return R.ok();
+ }
+
+ /*
+ 鏃犺鍗曟嫞璐у嚭搴�
+ */
+ @RequestMapping("/plaDetl/packout/noOrder/v1")
+ //@ManagerAuth(memo="pla鎵嬪姩鍑哄簱")
+ public R plaPackOutWithoutOrder(@RequestBody List<PlaParam> params){
+
+ for (PlaParam param : params){
+ mobileService.plaPackOutWithoutOrder(param.getBrand(),param.getBatch(),param.getPackageNo(),param.getAnfme());
+ }
+
return R.ok();
}
@@ -570,6 +586,12 @@
return R.ok();
}
+ @RequestMapping("select/mat/information/v1")
+ @ManagerAuth
+ public R pdaSelectInformation(@RequestParam String barcode){
+ List<Pla> locDetls = mobileService.pdaSelectInfmt(barcode);
+ return R.ok(locDetls);
+ }
public static void main(String[] args) {
--
Gitblit v1.9.1