From 7ec37083b96e0e48948e86263f6038fd2cb249cb Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期三, 24 一月 2024 15:49:52 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MobileController.java | 63 ++++++++++++++++++++++++++-----
1 files changed, 52 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 0ec5bf0..5075cdc 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -1,5 +1,7 @@
package com.zy.asrs.controller;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.ManagerAuth;
@@ -8,15 +10,13 @@
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
-import com.zy.asrs.entity.param.CombParam;
-import com.zy.asrs.entity.param.MobileAdjustNewParam;
-import com.zy.asrs.entity.param.MobileAdjustParam;
-import com.zy.asrs.entity.param.OffSaleParam;
+import com.zy.asrs.entity.param.*;
import com.zy.asrs.entity.result.MobileAdjustResult;
import com.zy.asrs.mapper.ManLocDetlMapper;
import com.zy.asrs.service.*;
import com.zy.common.model.WrkDto;
import com.zy.common.web.BaseController;
+import com.zy.system.entity.User;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -54,6 +54,8 @@
private PackService packService;
@Autowired
private ManLocDetlMapper manLocDetlMapper;
+ @Autowired
+ private PlaService plaService;
// 鍟嗗搧涓婃灦
@@ -419,16 +421,25 @@
}
@RequestMapping("/plaDetl/packin/v1")
-// @ManagerAuth(memo="pla鍏ュ簱")
+ //@ManagerAuth(memo="pla鍏ュ簱")
public R plaPackIn(@RequestBody JSONObject json){
String locNo = json.get("locNo").toString();
- String batch = json.get("batch").toString();
- String packageNo = json.get("packageNo").toString();
- if(Cools.isEmpty(locNo) || Cools.isEmpty(batch) || Cools.isEmpty(packageNo)){
- return R.error("鏈夊弬鏁颁负绌猴紝鏃犳硶鍏ュ簱");
+ JSONArray jsonArray = JSONArray.parseArray(json.getJSONArray("pla").toJSONString());
+ for (Object o : jsonArray){
+ JSONObject jsonObject = (JSONObject)o;
+ String batch = jsonObject.get("batch").toString();
+ String packageNo = jsonObject.get("packageNo").toString();
+ if(Cools.isEmpty(locNo) || Cools.isEmpty(batch) || Cools.isEmpty(packageNo)){
+ return R.error("鏈夊弬鏁颁负绌猴紝鏃犳硶鍏ュ簱");
+ }
+ //娴嬭瘯
+ if(true){
+ User user = new User();
+ user.setUsername("test");
+ mobileService.plaPakin(locNo,batch,packageNo,user);
+ }
}
- mobileService.plaPakin(locNo,batch,packageNo);
- return R.ok();
+ return R.ok("鍏ュ簱鎴愬姛");
}
@RequestMapping("/plaDetl/packout1/v1")
@@ -468,4 +479,34 @@
mobileService.plaPakout(locNo,batch,packageNo,orderNo,orderDetlId,wrkNo,anfme);
return R.ok();
}
+
+
+ @RequestMapping("/plaDetl/check/v1")
+ public R plaDetlCheck(@RequestBody JSONObject json){
+ String batch = json.get("batch").toString();
+ String packageNo = json.get("packageNo").toString();
+
+ if(Cools.isEmpty(batch) || Cools.isEmpty(packageNo)){
+ return R.error("鏈夊弬鏁颁负绌猴紝鏃犳硶鍏ュ簱");
+ }
+
+ Pla pla = plaService.selectByBatchAndPackageNo(batch, packageNo);
+ if ((Cools.isEmpty(pla))){
+ return R.error("璇ュ寘鐗╂枡鏈綍鍏ワ紝鏃犳硶鏌ヨ鍒扮浉鍏充俊鎭�");
+ }
+ if(!Cools.eq(pla.getStatus(), GlobleParameter.PLA_STATUS_0)){
+ return R.error("璇ュ寘鐗╂枡涓嶄负寰呭叆搴撶姸鎬侊紝鏃犳硶杩涜鍏ュ簱鎿嶄綔");
+ }
+ return R.ok(pla);
+ }
+
+ public static void main(String[] args) {
+ String aa = "[{\"batch\":\"2023090304\",\"packageNo\":\"8\"},{\"batch\":\"2023090304\",\"packageNo\":\"8\"}]";
+ JSONArray jsonArray = JSON.parseArray(aa);
+ Object o = jsonArray.get(0);
+ System.out.println(o.toString());
+ JSONObject jsonObject = (JSONObject)o;
+ System.out.println(jsonObject);
+ }
+
}
--
Gitblit v1.9.1