From 6004efd6f95e26c718325675adcac6149c21b392 Mon Sep 17 00:00:00 2001
From: zwl <zwl123456>
Date: 星期四, 11 九月 2025 15:19:11 +0800
Subject: [PATCH] U8订单对接完成(需正式账套)
---
src/main/java/com/zy/asrs/service/OrderService.java | 2
src/main/java/com/zy/asrs/entity/WaitPakinLog.java | 12 ++++++
src/main/java/com/zy/asrs/entity/WaitPakin.java | 12 +++++
src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java | 11 ++++-
src/main/java/com/zy/asrs/controller/OpenController.java | 3 +
src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java | 39 +++++++++++++++----
src/main/java/com/zy/asrs/task/AutoReportingScheduler.java | 6 ++-
src/main/webapp/static/js/order/order.js | 3 +
src/main/java/com/zy/asrs/entity/result/OrderRsult.java | 1
src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 2
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 2 +
src/main/resources/application.yml | 20 ++++++++--
12 files changed, 91 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 6424fbb..0ec61f7 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -51,7 +51,7 @@
public synchronized R syncStockUpload(@RequestHeader(required = false) String appkey,
@RequestBody(required = false) List<MatSyncParam> param,
HttpServletRequest request){
-// auth(appkey, param, request);
+ auth(appkey, param, request);
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
}
@@ -81,6 +81,7 @@
* 娣诲姞鍏ュ簱鍗�
*/
@PostMapping("/pakin/execute/auth/v1")
+ @AppAuth(memo = "娣诲姞鍏ュ簱鍗�")
public synchronized R pakinOrderCreate(@RequestHeader(required = false) String appkey,
@RequestBody OpenOrderPakinParam param,
HttpServletRequest request) {
diff --git a/src/main/java/com/zy/asrs/entity/WaitPakin.java b/src/main/java/com/zy/asrs/entity/WaitPakin.java
index 21a45ed..2179e56 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakin.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakin.java
@@ -3,7 +3,10 @@
import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableName;
import com.core.common.Cools;
+import com.core.common.SpringUtils;
import com.zy.common.utils.Synchro;
+import com.zy.system.entity.User;
+import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -177,7 +180,14 @@
return String.valueOf(this.source);
}
}
-
+ public String getModiUser$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.modiUser);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getUsername());
+ }
+ return null;
+ }
public String getInspect$(){
if (null == this.inspect){ return null; }
switch (this.inspect){
diff --git a/src/main/java/com/zy/asrs/entity/WaitPakinLog.java b/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
index 2d0e335..c36786f 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
@@ -3,6 +3,9 @@
import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableName;
import com.core.common.Cools;
+import com.core.common.SpringUtils;
+import com.zy.system.entity.User;
+import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -215,4 +218,13 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
}
+ public String getModiUser$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.modiUser);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getUsername());
+ }
+ return null;
+ }
+
}
diff --git a/src/main/java/com/zy/asrs/entity/result/OrderRsult.java b/src/main/java/com/zy/asrs/entity/result/OrderRsult.java
index 8237e2f..02a36f5 100644
--- a/src/main/java/com/zy/asrs/entity/result/OrderRsult.java
+++ b/src/main/java/com/zy/asrs/entity/result/OrderRsult.java
@@ -34,6 +34,7 @@
public String cirdcode;
public String codepcode;
public String cidepcode;
+ public String wms_operator;
}
@Data
diff --git a/src/main/java/com/zy/asrs/service/OrderService.java b/src/main/java/com/zy/asrs/service/OrderService.java
index 1711cc9..1e1d9e1 100644
--- a/src/main/java/com/zy/asrs/service/OrderService.java
+++ b/src/main/java/com/zy/asrs/service/OrderService.java
@@ -16,7 +16,7 @@
boolean updateSettle(Long orderId, Long settle, Long userId);
- void checkComplete(String orderNo);
+ void checkComplete(String orderNo,WrkDetl wrkDetl);
boolean saveHandlerOrder(Boolean pakin, WrkMast wrkMast, List<WrkDetl> wrkDetls);
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 fbc71c2..e248bab 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -132,6 +132,7 @@
orderDetl.setQty(0.0D);
orderDetl.setWorkQty(0.0D);
orderDetl.setUnits(0.0);
+ orderDetl.setMemo(detlDto.getMemo());
if (!orderDetlService.insert(orderDetl)) {
throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
@@ -269,6 +270,7 @@
orderDetl.setQty(0.0D);
orderDetl.setWorkQty(0.0D);
orderDetl.setUnits(0.0);
+ orderDetl.setMemo(detlDto.getMemo());
if (!orderDetlService.insert(orderDetl)) {
throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
index 693b9b9..f3fb617 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
@@ -19,11 +19,14 @@
import com.zy.asrs.service.OrderService;
import com.zy.common.model.DetlDto;
import com.zy.common.utils.HttpHandler;
+import com.zy.system.entity.User;
+import com.zy.system.service.UserService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
import java.text.Format;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
@@ -39,12 +42,23 @@
@Autowired
private OrderDetlService orderDetlService;
+ @Resource
+ private UserService userService;
+
@Autowired
private ApiLogService apiLogService;
@Value("${erp.switch.ReviewOrderSwitch}")
private Boolean switchReviewOrderSwitch;
@Value("${erp.address.URL}")
private String URL;
+ @Value("${erp.address.sServer}")
+ private String sServer;
+ @Value("${erp.address.sAccID}")
+ private String sAccID;
+ @Value("${erp.address.sUserID}")
+ private String sUserID;
+ @Value("${erp.address.sPassword}")
+ private String sPassword;
@Value("${erp.address.inaddressSave}")
private String inaddressSave;
@Value("${erp.address.outaddressSave}")
@@ -140,10 +154,10 @@
OrderRsult.Login login = new OrderRsult.Login();
OrderRsult.HeadTable headTable = new OrderRsult.HeadTable();
OrderRsult.BodyTable bodyTable = new OrderRsult.BodyTable();
- login.setSAccID("999"); //璐﹀鍙� 鍥哄畾
- login.setSUserID("sys");//U8鐧婚檰璐﹀彿 鍥哄畾
- login.setSPassword("123456");//U8鐧婚檰瀵嗙爜 鍥哄畾
- login.setSServer("10.1.9.20");//U8鏈嶅姟鍣ㄥ湴鍧�銆�鍥哄畾
+ login.setSAccID(sAccID); //璐﹀鍙� 鍥哄畾
+ login.setSUserID(sUserID);//U8鐧婚檰璐﹀彿 鍥哄畾
+ login.setSPassword(sPassword);//U8鐧婚檰瀵嗙爜 鍥哄畾
+ login.setSServer(sServer);//U8鏈嶅姟鍣ㄥ湴鍧�銆�鍥哄畾
orderRsult.setLogin(login);
orderRsult.setVerifier("sys");//鍗曟嵁绫诲瀷銆� 鍥哄畾
orderRsult.setCommandType(sts.equals(1) ? "鏂板" : "鍏抽棴");//鎿嶄綔绫诲瀷 銆�鍥哄畾
@@ -158,8 +172,8 @@
headTable.setCmaker("sys");//鍒跺崟浜哄悕绉�
headTable.setVt_id("89");//妯℃澘鍙� 榛樿
- headTable.setCiwhcode("");//杞叆浠撳簱缂栫爜
- headTable.setCowhcode("");//杞嚭浠撳簱缂栫爜
+ headTable.setCiwhcode("1");//杞叆浠撳簱缂栫爜
+ headTable.setCowhcode("1");//杞嚭浠撳簱缂栫爜
headTable.setCordcode("");//鍑哄簱绫诲埆缂栫爜 榛樿
headTable.setCirdcode("");//鍏ュ簱绫诲埆缂栫爜 榛樿
headTable.setCodepcode("");//杞嚭閮ㄩ棬缂栫爜
@@ -176,9 +190,18 @@
bodyTable.setCoutposcode("");//鐩爣璐т綅
bodyTable.setItrsid(orderDetl.getMemo());//琛屼富閿�
bodyTable.setEditprop(sts.equals(1) ? "A" : "B");//鐘舵�� A 鏂板
+ User user = userService.selectById(orderDetl.getUpdateBy());
+ headTable.setWms_operator(user == null ? "" : user.getUsername()); // 鎿嶄綔璐﹀彿鍚嶇О
+ ArrayList<OrderRsult.BodyTable> bodyTables = new ArrayList<>();
+ bodyTables.add(bodyTable);
+ orderRsult.setBodyTable(bodyTables);
- if (order.getDocType()>10L) {
+ ArrayList<OrderRsult.HeadTable> headTables = new ArrayList<>();
+ headTables.add(headTable);
+ orderRsult.setHeadTable(headTables);
+
+ if (order.getDocType() == 34L) {
ERPPath=outaddressSave;
}
ERPName=order.getDocType$();
@@ -196,7 +219,7 @@
System.out.println("response:"+response);
JSONObject jsonObject = JSON.parseObject(response);
- if (jsonObject.getInteger("code").equals(200)) {
+ if (jsonObject.getInteger("code").equals(1)) {
orderDetl.setUnits(qty+orderDetl.getUnits());
orderDetl.setStatus(sts);
orderDetlService.updateById(orderDetl);
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
index 2d7c4fa..8f361d5 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
@@ -58,7 +58,7 @@
}
@Override
- public void checkComplete(String orderNo) {
+ public void checkComplete(String orderNo,WrkDetl wrkDetl) {
Order order = this.selectByNo(orderNo);
if (Cools.isEmpty(order) || order.getSettle() >= 4L) {
return;
@@ -76,8 +76,13 @@
if (Objects.equals(orderDetl.getAnfme(), orderDetl.getQty())&&
orderDetl.getQty()>orderDetl.getUnits()
&&orderDetl.getInspect()<2) {
- orderDetl.setInspect(2);//绛夊緟涓婃姤
- orderDetlService.updateById(orderDetl);
+ if (order.getDocType() == 33) {
+ // 鍙湁璋冩嫧鍏ュ簱鍗曚笂鎶� 33.璋冩嫧鍏ュ簱鍗�
+ orderDetl.setInspect(2);//绛夊緟涓婃姤
+ orderDetl.setUpdateBy(wrkDetl.getAppeUser());
+ orderDetl.setUpdateTime(wrkDetl.getAppeTime());
+ orderDetlService.updateById(orderDetl);
+ }
}
}
if (complete) {
diff --git a/src/main/java/com/zy/asrs/task/AutoReportingScheduler.java b/src/main/java/com/zy/asrs/task/AutoReportingScheduler.java
index ae1b1d7..6aa50ac 100644
--- a/src/main/java/com/zy/asrs/task/AutoReportingScheduler.java
+++ b/src/main/java/com/zy/asrs/task/AutoReportingScheduler.java
@@ -14,6 +14,7 @@
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
+import javax.annotation.Resource;
import java.util.List;
@Component
@@ -23,9 +24,10 @@
private OrderService orderService;
+ @Resource
private OrderDetlService orderDetlService;
- @Scheduled(cron = "0/3 * * * * ? ")
+ @Scheduled(cron = "0/30 * * * * ? ")
private void execute(){
List< OrderDetl> orderDetls=orderDetlService.selectList(new EntityWrapper<OrderDetl>()
.eq("status",1)
@@ -34,7 +36,7 @@
return;
}
for (OrderDetl orderDetl : orderDetls) {
- orderDetlService.U8Reporting(orderDetl.getId(),1);
+ orderDetlService.U8Reporting(orderDetl.getId(),0);
}
}
}
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
index d71d3e4..18d0145 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -49,7 +49,7 @@
while (iterator.hasNext()) {
WrkDetl wrkDetl = iterator.next();
if (!Cools.isEmpty(wrkDetl.getOrderNo())) {
- orderService.checkComplete(wrkDetl.getOrderNo());
+ orderService.checkComplete(wrkDetl.getOrderNo(),wrkDetl);
iterator.remove();
}
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 8219a60..5a5981f 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -11,6 +11,8 @@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
url: jdbc:sqlserver://127.0.0.1:1433;databasename=dlzasrs
+ #娴嬭瘯鏁版嵁搴�
+# url: jdbc:sqlserver://127.0.0.1:1433;databasename=dlznewasrs
username: sa
password: sa@123
mvc:
@@ -79,10 +81,20 @@
ReviewOrderSwitch: false
# 鍦板潃
address:
- URL: http://158.210.10.90:28090
-# #鍗曟嵁锛屽晢鍝佹。妗堝湴鍧�
-# inaddress: K3CLOUD/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.ExecuteBillQuery.common.kdsvc
+ #姝ｅ紡
+# URL: http://10.10.0.34:33117
+# sServer: 10.10.0.34
+# sAccID: (default)@980
+# sUserID: PW008
+# sPassword: D#012332.
+ #娴嬭瘯
+ URL: http://10.10.0.34:33117
+ sServer: 10.10.0.10
+ sAccID: (default)@980
+ sUserID: PW008
+ sPassword: D#012332.
+
#鍏ュ簱缁撴灉涓婃姤锛堟彁浜わ級鍗曞湴鍧�
- inaddressSave: K3CLOUD/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Save.common.kdsvc
+ inaddressSave: api/U8Voucher
#鍑哄簱缁撴灉涓婃姤锛堟彁浜わ級鍗曞湴鍧�
outaddressSave: K3Cloud/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit.common.kdsvc
\ No newline at end of file
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index ad09170..a2b9309 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -136,7 +136,8 @@
// },
// {field: 'inQty', title: '宸插叆搴撻噺'},
// {field: 'color', title: '棰滆壊'},
- {field: 'specs', title: '瑙勬牸'}
+ {field: 'specs', title: '瑙勬牸'},
+ {field: 'memo', title: '澶囨敞'}
]],
request: {
pageName: 'curr',
--
Gitblit v1.9.1