From ea3151e1e9378a8454d3119908b47aa72f8869e6 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期三, 28 二月 2024 16:33:46 +0800
Subject: [PATCH] Merge branch 'tzhneasrs' of http://47.97.1.152:5880/r/zy-asrs into tzhneasrs
---
src/main/java/com/zy/asrs/controller/MobileController.java | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 986ea75..ac86564 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -430,7 +430,7 @@
for (Object o : jsonArray){
JSONObject jsonObject = (JSONObject)o;
String batch = jsonObject.get("batch").toString();
- Integer packageNo = (Integer) jsonObject.get("packageNo");
+ Integer packageNo = Integer.parseInt(jsonObject.get("packageNo").toString());
if(Cools.isEmpty(locNo) || Cools.isEmpty(batch) || Cools.isEmpty(packageNo)){
return R.error("鏈夊弬鏁颁负绌猴紝鏃犳硶鍏ュ簱");
}
@@ -449,7 +449,7 @@
public R plaPackOut1(@RequestBody JSONObject json){
String locNo = json.get("locNo").toString();
String batch = json.get("batch").toString();
- Integer packageNo = (Integer) json.get("packageNo");
+ Integer packageNo = Integer.parseInt(json.get("packageNo").toString());
String orderNo = json.get("orderNo").toString();
String orderDetlId = json.get("orderDetlId").toString();
String wrkNo = json.get("wrkNo").toString();
@@ -468,7 +468,7 @@
public R plaPackOut(@RequestBody JSONObject json){
String locNo = json.get("locNo").toString();
String batch = json.get("batch").toString();
- Integer packageNo = (Integer) json.get("packageNo");
+ Integer packageNo = Integer.parseInt(json.get("packageNo").toString());
String orderNo = json.get("orderNo").toString();
String orderDetlId = json.get("orderDetlId").toString();
String wrkNo = json.get("wrkNo").toString();
@@ -486,8 +486,7 @@
@RequestMapping("/plaDetl/check/v1")
public R plaDetlCheck(@RequestBody JSONObject json){
String batch = json.get("batch").toString();
- Integer packageNo = (Integer) json.get("packageNo");
-
+ Integer packageNo = Integer.parseInt(json.get("packageNo").toString());
if(Cools.isEmpty(batch) || Cools.isEmpty(packageNo)){
return R.error("鏈夊弬鏁颁负绌猴紝鏃犳硶鍏ュ簱");
}
@@ -509,7 +508,7 @@
public R plaDetlMove(@RequestBody JSONObject json){
String batch = json.get("batch").toString();
- Integer packageNo = (Integer) json.get("packageNo");
+ Integer packageNo = Integer.parseInt(json.get("packageNo").toString());
String locNo = json.get("locNo").toString();
if(Cools.isEmpty(batch) || Cools.isEmpty(packageNo)){
@@ -534,7 +533,8 @@
plaService.updateById(pla);
- SaasUtils.insertLog(2,sourceLocNo,pla.getBrand(),pla.getWeightAnfme(),getUser().getUsername(),locNo,pla.getBatch(),pla.getPackageNo());
+ SaasUtils.insertLog(2,sourceLocNo,pla.getBrand(),pla.getWeightAnfme(),getUser().getUsername(),
+ locNo,pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop());
return R.ok();
}
@@ -553,7 +553,11 @@
@RequestMapping("/manpakout/pakout/v1")
public R pakout(@RequestBody JSONObject json){
+ String batch = json.get("batch").toString();
+ Integer packageNo = Integer.parseInt(json.get("packageNo").toString());
String orderNo = json.get("orderNo").toString();
+
+
return R.ok();
}
@@ -569,6 +573,9 @@
String s = "2024010502";
System.out.println(s.substring(8,10));
+
+ Object s1 = "8";
+ System.out.println(Integer.parseInt(s1.toString()));
}
}
--
Gitblit v1.9.1