From 0f55c3628ce9d747953c2afe1fdd945baa357e65 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期二, 09 七月 2024 10:18:12 +0800
Subject: [PATCH] erp上报功能
---
src/main/java/com/zy/asrs/controller/MobileController.java | 53 +++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 47 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 56fe027..b606a4e 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,9 +427,14 @@
@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());
+ //鍒ゆ柇姝ゆ鍏ュ簱鏄惁杈惧埌搴撳瓨涓婇檺
+ if(!mobileService.checkMaximum(locNo,jsonArray.size())){
+ return R.error("褰撳墠鍏ュ簱鍖呮暟宸茶秴杩囧簱瀛樹笂闄�");
+ }
for (Object o : jsonArray){
JSONObject jsonObject = (JSONObject)o;
String brand = jsonObject.get("brand").toString();
@@ -442,6 +450,35 @@
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);
+ json.put("user",user.getUsername());
+ }
+ }
+ //鍏ュ簱鎴愬姛鍚庝笂鎶RP
+ openService.pakinReportErp(json);
return R.ok("鍏ュ簱鎴愬姛");
}
@@ -514,10 +551,10 @@
Pla pla = plaService.selectByBatchAndPackageNo(batch, packageNo,brand);
if ((Cools.isEmpty(pla))){
- return R.error("璇ュ寘鐗╂枡鏈綍鍏ワ紝鏃犳硶鏌ヨ鍒扮浉鍏充俊鎭�");
+ return R.error("璇ュ寘鐗╂枡鏈綍鍏ワ紝鏃犳硶鏌ヨ鍒扮浉鍏充俊鎭�").add(pla);
}
if(!(Cools.eq(pla.getStatus(), GlobleParameter.PLA_STATUS_0) || Cools.eq(pla.getStatus(), GlobleParameter.PLA_STATUS_00)) && type != 2){
- return R.error("璇ュ寘鐗╂枡涓嶄负寰呭叆搴撶姸鎬侊紝鏃犳硶杩涜鍏ュ簱鎿嶄綔");
+ return R.error("璇ュ寘鐗╂枡鐨勭姸鎬佷负" + pla.getStatus() +"锛屾棤娉曡繘琛屽叆搴撴搷浣�").add(pla);
}
return R.ok(pla);
}
@@ -537,6 +574,10 @@
}
List<PlaMoveParam.PlaMove> plas = param.getPlas();
+ //鍒ゆ柇姝ゆ鍏ュ簱鏄惁杈惧埌搴撳瓨涓婇檺
+ if(!mobileService.checkMaximum(locNo,plas.size())){
+ return R.error("褰撳墠鍏ュ簱鍖呮暟宸茶秴杩囧簱瀛樹笂闄�");
+ }
param.getPlas().forEach(p -> {
String brand = p.getBrand();
@@ -550,7 +591,7 @@
throw new CoolException("璇ュ寘鐗╂枡鏈綍鍏ワ紝鏃犳硶鏌ヨ鍒扮浉鍏充俊鎭�");
}
if(!Cools.eq(pla.getStatus(),GlobleParameter.PLA_STATUS_1) && !Cools.eq(pla.getStatus(),GlobleParameter.PLA_STATUS_3)){
- throw new CoolException("璇ュ寘鐗╂枡鐘舵�佷笉涓哄叆搴撶姸鎬侊紝鏃犳硶杞Щ");
+ throw new CoolException("璇ュ寘鐗╂枡鐨勭姸鎬佷负" + pla.getStatus() +"锛屾棤娉曡繘琛屽叆搴撴搷浣�");
}
String sourceLocNo = pla.getLocNo();
@@ -560,11 +601,11 @@
plaService.updateById(pla);
SaasUtils.insertLog(2,sourceLocNo,pla.getBrand(),pla.getWeightAnfme(),getUser().getUsername(),
- locNo,pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop());
+ locNo,pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop(),null);
});
- return R.ok();
+ return R.ok("绉诲簱鎴愬姛");
}
/*
--
Gitblit v1.9.1