From fd93c4901b76347b46a05a5fd231760d5245579d Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 17 七月 2023 10:35:22 +0800
Subject: [PATCH] #订单下发自动添加货主信息
---
src/main/java/com/zy/common/model/DetlDto.java | 1 +
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 21 +++++++++++++++++++++
src/main/resources/application.yml | 2 +-
3 files changed, 23 insertions(+), 1 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 858d596..5a46d16 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -62,6 +62,8 @@
private ManLocDetlService manLocDetlService;
@Autowired
private ManPakOutService manPakOutService;
+ @Autowired
+ private LocOwnerService locOwnerService;
@Override
@Transactional
@@ -69,6 +71,18 @@
Order order = orderService.selectByNo(param.getOrderNo());
if (!Cools.isEmpty(order)) {
throw new CoolException(param.getOrderNo() + "鍗曟嵁宸插瓨鍦紝璇峰嬁閲嶅鎻愪氦");
+ }
+
+ for (DetlDto detlDto : param.getOrderDetails()){
+ if (Cools.isEmpty(detlDto) || Cools.isEmpty(detlDto.getOwnerName(),detlDto.getPayment())){
+ throw new CoolException(param.getOrderNo() + "缂哄皯璐т富鎴栬揣鐗╁舰鎬�");
+ }else {
+ LocOwner locOwner = locOwnerService.selectOne(new EntityWrapper<LocOwner>().eq("owner", detlDto.getOwnerName()));
+ if (Cools.isEmpty(locOwner)){
+ LocOwner locOwner1 = new LocOwner();
+ locOwner1.setOwner(detlDto.getOwnerName());
+ }
+ }
}
DocType docType = docTypeService.selectOrAdd(param.getOrderType(), Boolean.TRUE);
Date now = new Date();
@@ -148,6 +162,13 @@
orderDetl.setCreateTime(now);
orderDetl.setUpdateBy(9527L);
orderDetl.setUpdateTime(now);
+ LocOwner locOwner = locOwnerService.selectOne(new EntityWrapper<LocOwner>().eq("owner", detlDto.getOwnerName()));
+ if (Cools.isEmpty(locOwner)){
+ throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
+ }else {
+ orderDetl.setOwner(locOwner.getId().intValue());
+ }
+ orderDetl.setPayment(detlDto.getPayment());
orderDetl.setStatus(1);
orderDetl.setQty(0.0D);
orderDetl.setWeight(detlDto.getWeight());
diff --git a/src/main/java/com/zy/common/model/DetlDto.java b/src/main/java/com/zy/common/model/DetlDto.java
index 4dc94d0..f56bb09 100644
--- a/src/main/java/com/zy/common/model/DetlDto.java
+++ b/src/main/java/com/zy/common/model/DetlDto.java
@@ -21,6 +21,7 @@
private Double anfme;
private int owner;
+ private String ownerName;
private int payment;
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index dfe5749..86d2833 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -14,7 +14,7 @@
enabled: false
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://10.10.10.100:1433;databasename=stasrs
+ url: jdbc:sqlserver://localhost:1433;databasename=stasrs
#url: jdbc:sqlserver://127.0.0.1:1433;databasename=stasrs
username: sa
password: sa@123
--
Gitblit v1.9.1