From 69c2eb64ab9772df8ac131cb94eeae5c32eb7d74 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期三, 25 九月 2024 09:15:29 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/controller/OpenController.java | 2
src/main/java/com/zy/asrs/entity/Order.java | 5 ++
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 102 ++++++++++++++++++++++++++------------------------
src/main/java/com/zy/asrs/service/OpenService.java | 3 +
4 files changed, 61 insertions(+), 51 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index f82d113..a86e91d 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -69,7 +69,7 @@
if (Cools.isEmpty(user)){
return R.error("鏈壘鍒扮敤鎴�");
}
- List<String> stringList = openService.selectOrderInformation(param);
+ List<Order> stringList = openService.selectOrderInformation(param);
return R.ok(stringList);
}
diff --git a/src/main/java/com/zy/asrs/entity/Order.java b/src/main/java/com/zy/asrs/entity/Order.java
index 99abc64..bf66c07 100644
--- a/src/main/java/com/zy/asrs/entity/Order.java
+++ b/src/main/java/com/zy/asrs/entity/Order.java
@@ -17,6 +17,7 @@
import java.io.Serializable;
import java.text.SimpleDateFormat;
import java.util.Date;
+import java.util.List;
@Data
@TableName("man_order")
@@ -261,6 +262,10 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ @TableField(exist = false)
+ private List<OrderDetl> orderDetls;
+
+
public Order() {}
public Order(String uuid,String orderNo,String orderTime,Long docType,Long itemId,String itemName,Long allotItemId,String defNumber,String number,Long cstmr,String cstmrName,String tel,String operMemb,Double totalFee,Double discount,Double discountFee,Double otherFee,Double actFee,Integer payType,String salesman,Integer accountDay,Integer postFeeType,Double postFee,Date payTime,Date sendTime,String shipName,String shipCode,Long settle,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
diff --git a/src/main/java/com/zy/asrs/service/OpenService.java b/src/main/java/com/zy/asrs/service/OpenService.java
index ee99b30..46235b3 100644
--- a/src/main/java/com/zy/asrs/service/OpenService.java
+++ b/src/main/java/com/zy/asrs/service/OpenService.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.JSONObject;
import com.core.common.R;
+import com.zy.asrs.entity.Order;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.entity.result.StockVo;
@@ -52,5 +53,5 @@
int pakinReportErp(JSONObject jsonObject) throws ParseException;
- List<String> selectOrderInformation(Map<String, String> param);
+ List<Order> selectOrderInformation(Map<String, String> param);
}
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..07c1a28 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,10 @@
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;
/**
* Created by vincent on 2022/4/9
@@ -92,12 +94,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 +152,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 +185,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());
@@ -214,7 +216,7 @@
//鏌ユ壘鍋氬崟鐢ㄦ埛
User user = userService.selectOne(new EntityWrapper<User>().eq("username", param.getCMaker()));
- if(Cools.isEmpty(user)){
+ if (Cools.isEmpty(user)) {
throw new CoolException("鏈煡璇㈠埌璇ョ敤鎴�");
}
@@ -259,7 +261,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,8 +415,8 @@
}
//鍒犻櫎瀛樿揣妗ｆ
- if(param.deleteFlag == 1){
- for (MatSyncParam.MatParam matParam : param.getMatDetails()){
+ if (param.deleteFlag == 1) {
+ for (MatSyncParam.MatParam matParam : param.getMatDetails()) {
matService.deleteById(matParam.getMatnr());
}
@@ -534,30 +536,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 +574,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 +583,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.size() == 0 || checkOrder(list, pla.getProOrderNo()) == null) {
OpenOrderPakoutParam param = new OpenOrderPakoutParam();
param.setcMaker(json.get("user").toString());
String type = Cools.isEmpty(pla.getProOrderNo()) ? "璋冩嫧鍏ュ簱鍗�" : "浜ф垚鍝佸叆搴�";
@@ -601,24 +603,24 @@
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.setCbMemo(pla.getMemo());
bodyList.add(body);
- }else {
+ } else {
body.setiQuantity(body.getIQuantity() + pla.getWeightAnfme());
}
}
}
- for (OpenOrderPakoutParam param : list){
+ for (OpenOrderPakoutParam param : list) {
doHttpRequest(param, "鍏ュ簱鍗曚笂鎶�", url, orderReportPath, null, "127.0.0.1");
}
@@ -630,36 +632,38 @@
}
@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 +672,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,7 +685,7 @@
}
- 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;
@@ -694,25 +698,25 @@
.doPost();
response = response.replace("\\", "");
- response = response.substring(1,response.length()-1);
+ response = response.substring(1, response.length() - 1);
JSONObject jsonObject = JSON.parseObject(response);
- JSONArray jsonArray = (JSONArray)jsonObject.get("");
+ JSONArray jsonArray = (JSONArray) jsonObject.get("");
JSONObject jsonResult = (JSONObject) jsonArray.get(0);
- if(Cools.isEmpty(jsonResult.get("ErrorCode"))){
+ if (Cools.isEmpty(jsonResult.get("ErrorCode"))) {
throw new CoolException(jsonResult.get("errorMsg").toString());
}
int code = Integer.parseInt(jsonResult.get("ErrorCode").toString());
- if(code != 1){
+ if (code != 1) {
throw new CoolException(jsonResult.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,
--
Gitblit v1.9.1