From 6c3d4d0530fd8f64e6fc92b996ec724eba316e94 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期二, 14 五月 2024 09:08:10 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MobileController.java | 91 +++++++++++++++++++++++++++++++++------------
1 files changed, 66 insertions(+), 25 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 1f7d8d6..b0dfc3e 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -22,6 +22,7 @@
import org.springframework.web.bind.annotation.*;
import java.math.BigDecimal;
+import java.text.ParseException;
import java.util.*;
/**
@@ -58,6 +59,8 @@
private PlaService plaService;
@Autowired
private NodeService nodeService;
+ @Autowired
+ private OpenService openService;
// 鍟嗗搧涓婃灦
@@ -424,7 +427,8 @@
@RequestMapping("/plaDetl/packin/v1")
//@ManagerAuth(memo="pla鍏ュ簱")
- public R plaPackIn(@RequestBody JSONObject json){
+ @Transactional
+ public R plaPackIn(@RequestBody JSONObject json) throws ParseException {
String locNo = json.get("locNo").toString();
JSONArray jsonArray = JSONArray.parseArray(json.getJSONArray("pla").toJSONString());
for (Object o : jsonArray){
@@ -442,6 +446,34 @@
mobileService.plaPakin(brand,locNo,batch,packageNo,user);
}
}
+ //鍏ュ簱鎴愬姛鍚庝笂鎶RP
+ //openService.pakinReportErp(json);
+ return R.ok("鍏ュ簱鎴愬姛");
+ }
+
+ @RequestMapping("/plaDetl/packin/v2")
+ //@ManagerAuth(memo="pla鍏ュ簱")
+ @Transactional
+ public R plaPackInTestErp(@RequestBody JSONObject json) throws ParseException {
+ String locNo = json.get("locNo").toString();
+ JSONArray jsonArray = JSONArray.parseArray(json.getJSONArray("pla").toJSONString());
+ for (Object o : jsonArray){
+ JSONObject jsonObject = (JSONObject)o;
+ 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)){
+ return R.error("鏈夊弬鏁颁负绌猴紝鏃犳硶鍏ュ簱");
+ }
+ //娴嬭瘯
+ if(true){
+ User user = new User();
+ user.setUsername("test");
+ mobileService.plaPakin(brand,locNo,batch,packageNo,user);
+ }
+ }
+ //鍏ュ簱鎴愬姛鍚庝笂鎶RP
+ openService.pakinReportErp(json);
return R.ok("鍏ュ簱鎴愬姛");
}
@@ -527,41 +559,44 @@
*/
@RequestMapping("/plaDetl/move/v1")
@ManagerAuth
- public R plaDetlMove(@RequestBody JSONObject json){
- String brand = json.get("brand").toString();
- String batch = json.get("batch").toString();
- Integer packageNo = Integer.parseInt(json.get("packageNo").toString());
- String locNo = json.get("locNo").toString();
+ public R plaDetlMove(@RequestBody PlaMoveParam param){
- if(Cools.isEmpty(batch) || Cools.isEmpty(packageNo)){
- return R.error("鏈夊弬鏁颁负绌猴紝鏃犳硶鍏ュ簱");
- }
-
- Pla pla = plaService.selectByBatchAndPackageNo(batch, packageNo,brand);
- if ((Cools.isEmpty(pla))){
- return R.error("璇ュ寘鐗╂枡鏈綍鍏ワ紝鏃犳硶鏌ヨ鍒扮浉鍏充俊鎭�");
- }
- if(!Cools.eq(pla.getStatus(),GlobleParameter.PLA_STATUS_1)){
- return R.error("璇ュ寘鐗╂枡鐘舵�佷笉涓哄凡鍏ュ簱鐘舵�侊紝鏃犳硶杞Щ");
- }
+ String locNo = param.getLocNo();
Node node = nodeService.selectByUuid(locNo);
if(Cools.isEmpty(node)){
throw new CoolException("搴撲綅淇℃伅涓嶆纭�");
}
- String sourceLocNo = pla.getLocNo();
+ List<PlaMoveParam.PlaMove> plas = param.getPlas();
- pla.setLocNo(locNo);
- pla.setStash(node.getParentName());
- pla.setModifyTime(new Date());
+ param.getPlas().forEach(p -> {
+ String brand = p.getBrand();
+ String batch = p.getBatch();
+ Integer packageNo = p.getPackageNo();
+ if(Cools.isEmpty(batch) || Cools.isEmpty(packageNo)){
+ throw new CoolException("鏈夊弬鏁颁负绌猴紝鏃犳硶鍏ュ簱");
+ }
+ Pla pla = plaService.selectByBatchAndPackageNo(batch, packageNo,brand);
+ if ((Cools.isEmpty(pla))){
+ throw new CoolException("璇ュ寘鐗╂枡鏈綍鍏ワ紝鏃犳硶鏌ヨ鍒扮浉鍏充俊鎭�");
+ }
+ if(!Cools.eq(pla.getStatus(),GlobleParameter.PLA_STATUS_1) && !Cools.eq(pla.getStatus(),GlobleParameter.PLA_STATUS_3)){
+ throw new CoolException("璇ュ寘鐗╂枡鐘舵�佷笉涓哄叆搴撶姸鎬侊紝鏃犳硶杞Щ");
+ }
- plaService.updateById(pla);
+ String sourceLocNo = pla.getLocNo();
+ pla.setLocNo(locNo);
+ pla.setStash(node.getParentName());
+ pla.setModifyTime(new Date());
- SaasUtils.insertLog(2,sourceLocNo,pla.getBrand(),pla.getWeightAnfme(),getUser().getUsername(),
- locNo,pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop());
+ plaService.updateById(pla);
+ SaasUtils.insertLog(2,sourceLocNo,pla.getBrand(),pla.getWeightAnfme(),getUser().getUsername(),
+ locNo,pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop());
- return R.ok();
+ });
+
+ return R.ok("绉诲簱鎴愬姛");
}
/*
@@ -586,6 +621,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