From 0916bb4ea987c0599b6af6bb8dd251a071770e05 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期四, 23 十月 2025 14:32:15 +0800
Subject: [PATCH] 通用下拉选择框值从视图获取
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 135 +++++++++++++++++++++++++--------------------
1 files changed, 75 insertions(+), 60 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 31a84af..080b2f9 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -9,7 +9,6 @@
import com.core.common.R;
import com.core.common.SnowflakeIdWorker;
import com.core.exception.CoolException;
-import com.sun.org.apache.xpath.internal.operations.Or;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.entity.result.InOutCountDto;
@@ -31,7 +30,11 @@
import org.springframework.transaction.annotation.Transactional;
import java.text.ParseException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
/**
* Created by vincent on 2022/4/9
@@ -49,6 +52,8 @@
@Autowired
private OrderService orderService;
+ @Autowired
+ private OrderLogService orderLogService;
@Autowired
private OrderDetlService orderDetlService;
@Autowired
@@ -92,12 +97,12 @@
throw new CoolException(param.getOrderNo() + "鍗曟嵁宸插瓨鍦紝璇峰嬁閲嶅鎻愪氦");
}
- for (DetlDto detlDto : param.getOrderDetails()){
- if (Cools.isEmpty(detlDto) || Cools.isEmpty(detlDto.getOwnerName(),detlDto.getPayment())){
+ for (DetlDto detlDto : param.getOrderDetails()) {
+ if (Cools.isEmpty(detlDto) || Cools.isEmpty(detlDto.getOwnerName(), detlDto.getPayment())) {
throw new CoolException(param.getOrderNo() + "缂哄皯璐т富鎴栬揣鐗╁舰鎬�");
- }else {
+ } else {
LocOwner locOwner = locOwnerService.selectOne(new EntityWrapper<LocOwner>().eq("owner", detlDto.getOwnerName()));
- if (Cools.isEmpty(locOwner)){
+ if (Cools.isEmpty(locOwner)) {
LocOwner locOwner1 = new LocOwner();
locOwner1.setOwner(detlDto.getOwnerName());
locOwnerService.insert(locOwner1);
@@ -150,7 +155,7 @@
List<DetlDto> list = new ArrayList<>();
List<DetlDto> orderDetails = param.getOrderDetails();
for (DetlDto detail : orderDetails) {
- DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getAnfme(),detail.getOwnerName(),detail.getPayment());
+ DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getAnfme(), detail.getOwnerName(), detail.getPayment());
if (DetlDto.has(list, dto)) {
DetlDto detlDto = DetlDto.find(list, dto.getMatnr(), dto.getBatch());
assert detlDto != null;
@@ -183,9 +188,9 @@
orderDetl.setUpdateBy(9527L);
orderDetl.setUpdateTime(now);
LocOwner locOwner = locOwnerService.selectOne(new EntityWrapper<LocOwner>().eq("owner", detlDto.getOwnerName()));
- if (Cools.isEmpty(locOwner)){
+ if (Cools.isEmpty(locOwner)) {
throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
- }else {
+ } else {
orderDetl.setOwner(locOwner.getId().intValue());
}
orderDetl.setPayment(detlDto.getPayment());
@@ -209,12 +214,17 @@
}
orderService.remove(order.getId());
}
+ OrderLog orderLog = orderLogService.selectByNo(param.getCCode());
+ if (!Cools.isEmpty(orderLog)) {
+ throw new CoolException(param.getCCode() + "鍗曟嵁宸茬粡瀹屾垚锛屼笉闇�瑕佸啀浼犻��");
+ }
+
DocType docType = docTypeService.selectOrAdd(param.getType(), Boolean.FALSE);
Date now = new Date();
//鏌ユ壘鍋氬崟鐢ㄦ埛
User user = userService.selectOne(new EntityWrapper<User>().eq("username", param.getCMaker()));
- if(Cools.isEmpty(user)){
+ if (Cools.isEmpty(user)) {
throw new CoolException("鏈煡璇㈠埌璇ョ敤鎴�");
}
@@ -259,7 +269,7 @@
throw new CoolException("鐢熸垚鍗曟嵁涓绘。澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
// 鍗曟嵁鏄庣粏妗�
- for (OpenOrderPakoutParam.Body body : param.getADDBody()){
+ for (OpenOrderPakoutParam.Body body : param.getADDBody()) {
Mat mat = matService.selectByMatnr(body.getCInvCode());
if (Cools.isEmpty(mat)) {
throw new CoolException(body.getCInvCode() + "缂栧彿鍟嗗搧妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧");
@@ -413,9 +423,9 @@
}
//鍒犻櫎瀛樿揣妗ｆ
- if(param.deleteFlag == 1){
- for (MatSyncParam.MatParam matParam : param.getMatDetails()){
- matService.deleteById(matParam.getMatnr());
+ if (param.deleteFlag == 1) {
+ for (MatSyncParam.MatParam matParam : param.getMatDetails()) {
+ matService.delete(new EntityWrapper<Mat>().eq("matnr", matParam.getMatnr()));
}
return;
@@ -534,30 +544,30 @@
}
/*
- * 閫熻吘鏁板瓧瀛敓璋冪敤鎺ュ彛
- * */
+ * 閫熻吘鏁板瓧瀛敓璋冪敤鎺ュ彛
+ * */
@Override
public DigitalTwin inventoryQuantity() {
DigitalTwin digitalTwin = new DigitalTwin();
LocChartPie locUseRate = reportQueryMapper.getLocUseRate();
LocChartPie locUseRateL = reportQueryMapper.getLocUseRateL();
LocChartPie locUseRateP = reportQueryMapper.getLocUseRateP();
- if(locUseRate!=null) {
- digitalTwin.setCount(locUseRate.getOqty()+locUseRate.getFqty()+locUseRate.getUqty()+locUseRate.getXqty());
+ if (locUseRate != null) {
+ digitalTwin.setCount(locUseRate.getOqty() + locUseRate.getFqty() + locUseRate.getUqty() + locUseRate.getXqty());
digitalTwin.setOqty(locUseRate.getOqty());
digitalTwin.setFqty(locUseRate.getFqty());
digitalTwin.setUqty(locUseRate.getUqty());
digitalTwin.setXqty(locUseRate.getXqty());
}
- if(locUseRateL!=null) {
- digitalTwin.setCountL(locUseRateL.getOqty()+locUseRateL.getFqty()+locUseRateL.getUqty()+locUseRateL.getXqty());
+ if (locUseRateL != null) {
+ digitalTwin.setCountL(locUseRateL.getOqty() + locUseRateL.getFqty() + locUseRateL.getUqty() + locUseRateL.getXqty());
digitalTwin.setOqtyL(locUseRateL.getOqty());
digitalTwin.setFqtyL(locUseRateL.getFqty());
digitalTwin.setUqtyL(locUseRateL.getUqty());
digitalTwin.setXqtyL(locUseRateL.getXqty());
}
- if (locUseRateP!=null){
- digitalTwin.setCountP(locUseRateP.getOqty()+locUseRateP.getFqty()+locUseRateP.getUqty()+locUseRateP.getXqty());
+ if (locUseRateP != null) {
+ digitalTwin.setCountP(locUseRateP.getOqty() + locUseRateP.getFqty() + locUseRateP.getUqty() + locUseRateP.getXqty());
digitalTwin.setOqtyP(locUseRateP.getOqty());
digitalTwin.setFqtyP(locUseRateP.getFqty());
digitalTwin.setUqtyP(locUseRateP.getUqty());
@@ -572,8 +582,8 @@
List<OpenOrderPakoutParam> list = new ArrayList<>();
- for (Object o : jsonArray){
- JSONObject jsonObject = (JSONObject)o;
+ 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());
@@ -581,7 +591,7 @@
Pla pla = plaService.selectByBatchAndPackageNo(batch, packageNo, brand);
Mat mat = matService.selectByMaktx(pla.getBrand());
//褰撶敓浜у崟鍙蜂笉涓�鑷存椂锛岄渶瑕佹柊寤轰竴涓猵aram
- if(list.size() == 0 || checkOrder(list,pla.getProOrderNo()) == null){
+ if (list.isEmpty() || (!Cools.isEmpty(pla.getProOrderNo()) && checkOrder(list, pla.getProOrderNo()) == null)) {
OpenOrderPakoutParam param = new OpenOrderPakoutParam();
param.setcMaker(json.get("user").toString());
String type = Cools.isEmpty(pla.getProOrderNo()) ? "璋冩嫧鍏ュ簱鍗�" : "浜ф垚鍝佸叆搴�";
@@ -594,72 +604,78 @@
OpenOrderPakoutParam.Body body = new OpenOrderPakoutParam.Body();
body.setcInvCode(mat.getMatnr());
body.setiQuantity(pla.getWeightAnfme());
- body.setcBatch("");
+ body.setcBatch(pla.getBatch());
+ body.setCPackage(pla.getPackageNo()+"");
body.setCbMemo(pla.getMemo());
bodyList.add(body);
param.setaDDBody(bodyList);
list.add(param);
- }else {
+ } else {
OpenOrderPakoutParam param = checkOrder(list, pla.getProOrderNo());
List<OpenOrderPakoutParam.Body> bodyList = param.getADDBody();
OpenOrderPakoutParam.Body body = checkOrderDetl(bodyList, mat.getMatnr());
//鏈夋柊鐨勭墝鍙峰垯娣诲姞鏂扮殑orderDetl锛屽惁鍒欑疮鍔�
- if(body == null){
+ if (body == null) {
body = new OpenOrderPakoutParam.Body();
body.setcInvCode(mat.getMatnr());
body.setiQuantity(pla.getWeightAnfme());
+ body.setcBatch(pla.getBatch());
+ body.setCPackage(pla.getPackageNo()+"");
body.setCbMemo(pla.getMemo());
bodyList.add(body);
- }else {
+ } else {
body.setiQuantity(body.getIQuantity() + pla.getWeightAnfme());
+ body.setcBatch(pla.getBatch());
+ body.setCPackage(pla.getPackageNo()+"");
}
}
}
- for (OpenOrderPakoutParam param : list){
+ for (OpenOrderPakoutParam param : list) {
doHttpRequest(param, "鍏ュ簱鍗曚笂鎶�", url, orderReportPath, null, "127.0.0.1");
}
-
return 200;
-
//return doHttpRequest(list, "鍏ュ簱鍗曚笂鎶�", url, orderReportPath, null, "127.0.0.1");
-
}
+
+
@Override
- public List<String> selectOrderInformation(Map<String, String> param) {
- ArrayList<String> list = new ArrayList<>();
+ public List<Order> selectOrderInformation(Map<String, String> param) {
+ List<Order> list = new ArrayList<>();
String name = param.get("name");
User user = userService.selectOne(new EntityWrapper<User>().eq("username", name));
- if (Cools.isEmpty(user)){
+ if (Cools.isEmpty(user)) {
return list;
}
List<Order> orderList = orderService.selectList(new EntityWrapper<Order>().eq("create_by", user.getId()));
- if (Cools.isEmpty(orderList)){
+ if (Cools.isEmpty(orderList)) {
return list;
}
- for (Order order : orderList){
- if (order.getSettle() ==1 || order.getSettle() ==2){
- list.add(order.getOrderNo());
+ for (Order order : orderList) {
+ if (order.getSettle() == 1 || order.getSettle() == 2) {
+ List<OrderDetl> detlList = orderDetlService.selectByOrderId(order.getId());
+ order.setOrderDetls(detlList);
+ list.add(order);
}
}
return list;
}
- private OpenOrderPakoutParam checkOrder(List<OpenOrderPakoutParam> list, String orderNo){
+ private OpenOrderPakoutParam checkOrder(List<OpenOrderPakoutParam> list, String orderNo) {
- for (OpenOrderPakoutParam param : list){
+ for (OpenOrderPakoutParam param : list) {
- if(Cools.eq("璋冩嫧鍏ュ簱鍗�",param.getType()) && Cools.isEmpty(orderNo)){
+ if (Cools.eq("璋冩嫧鍏ュ簱鍗�", param.getType()) && Cools.isEmpty(orderNo)) {
return param;
}
//鍒ゆ柇鏄惁鍖呭惈閲嶅鐨勮鍗曞彿
- if(Cools.eq(param.getCCode(),orderNo)){
+ if (Cools.eq(param.getCCode(), orderNo)) {
return param;
}
}
@@ -668,11 +684,11 @@
}
- private OpenOrderPakoutParam.Body checkOrderDetl(List<OpenOrderPakoutParam.Body> bodyList, String matnr){
+ private OpenOrderPakoutParam.Body checkOrderDetl(List<OpenOrderPakoutParam.Body> bodyList, String matnr) {
- for (OpenOrderPakoutParam.Body param : bodyList){
+ for (OpenOrderPakoutParam.Body param : bodyList) {
//鍒ゆ柇鏄惁鍖呭惈閲嶅鐨勮鍗曞彿
- if(Cools.eq(param.getCInvCode(),matnr)){
+ if (Cools.eq(param.getCInvCode(), matnr)) {
return param;
}
}
@@ -681,38 +697,36 @@
}
- private int doHttpRequest(Object requestParam, String namespace, String url, String path, String appkey, String ip){
+ private int doHttpRequest(Object requestParam, String namespace, String url, String path, String appkey, String ip) {
String response = "";
boolean success = false;
try {
+ log.info("璇锋眰鍙傛暟锛歿}", requestParam);
response = new HttpHandler.Builder()
.setUri(url)
+ .setTimeout(30, TimeUnit.SECONDS)
.setPath(path)
.setJson(JSONObject.toJSONString(requestParam))
.build()
.doPost();
-
- response = response.replace("\\", "");
- response = response.substring(1,response.length()-1);
+ log.info("鍏ュ簱鍗曚笂鎶ヨ姹傝繑鍥炴姤鏂囷細{}", response);
JSONObject jsonObject = JSON.parseObject(response);
- JSONArray jsonArray = (JSONArray)jsonObject.get("");
- JSONObject jsonResult = (JSONObject) jsonArray.get(0);
- if(Cools.isEmpty(jsonResult.get("ErrorCode"))){
- throw new CoolException(jsonResult.get("errorMsg").toString());
+ if (Cools.isEmpty(jsonObject.get("ErrorCode"))) {
+ throw new CoolException(jsonObject.get("ErrorMsg").toString());
}
- int code = Integer.parseInt(jsonResult.get("ErrorCode").toString());
- if(code != 1){
- throw new CoolException(jsonResult.get("errorMsg").toString());
+ int code = Integer.parseInt(jsonObject.get("ErrorCode").toString());
+ if (code == 0) {
+ throw new CoolException(jsonObject.get("ErrorMsg").toString());
}
success = true;
return code;
- }catch (Exception e){
+ } catch (Exception e) {
log.error(e.getMessage());
throw new CoolException(e.getMessage());
- }finally {
+ } finally {
apiLogService.save(
namespace,
url + path,
@@ -726,4 +740,5 @@
}
+
}
--
Gitblit v1.9.1