From 2542100dc06739c6f853fd3ff3ce06d72e0e5fe3 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期六, 13 十二月 2025 17:40:18 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java | 2 +-
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 18 ++----------------
src/main/java/com/zy/erp/kingdee/enums/KingDeeUtilType.java | 10 +++++-----
3 files changed, 8 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
index 4d5d086..4d41cde 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -261,9 +261,8 @@
// .doPost();
// JSONObject jsonObject = JSON.parseObject(response);
// if (jsonObject.getInteger("code").equals(200)) {
- if (true) {
- success = true;
- // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
+ if (order.getSettle() == 8L) {
+ // 淇敼璁㈠崟鐘舵�� 8.瀹屾垚 ===>> 6.宸蹭笂鎶�
if (!orderService.updateSettle(order.getId(), settle, null)) {
throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
}
@@ -275,19 +274,6 @@
log.error("fail", e);
// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return FAIL.setMsg(e.getMessage());
- } finally {
- try {
- // 淇濆瓨鎺ュ彛鏃ュ織
- apiLogService.save(
- "鍑哄簱涓婃姤",
- MesConstant.URL + MesConstant.PAKOUT_URL,
- null,
- "127.0.0.1",
- JSON.toJSONString(pakoutParam),
- response,
- success
- );
- } catch (Exception e) { log.error("", e); }
}
}
return SUCCESS;
diff --git a/src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java
index dbf44b8..604a603 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java
@@ -44,7 +44,7 @@
List<Order> orders = orderService.selectComplete();
if(orders.size() > 0){
for (Order order : orders) {
- if(order.getDocType() == 3 || order.getDocType() == 18 || order.getDocType() == 19){
+ if(order.getDocType() == 3 || order.getDocType() == 16 || order.getDocType() == 18 || order.getDocType() == 19){
ReturnT<String> result = saveOrderSyncHandler.start(order);//4宸插畬鎴�
if (!result.isSuccess()) {
log.error("鍗曟嵁[orderNo={}]鏂板淇濆瓨鑷砮rp澶辫触", order.getOrderNo());
diff --git a/src/main/java/com/zy/erp/kingdee/enums/KingDeeUtilType.java b/src/main/java/com/zy/erp/kingdee/enums/KingDeeUtilType.java
index 1b8cc73..babd798 100644
--- a/src/main/java/com/zy/erp/kingdee/enums/KingDeeUtilType.java
+++ b/src/main/java/com/zy/erp/kingdee/enums/KingDeeUtilType.java
@@ -1,15 +1,15 @@
package com.zy.erp.kingdee.enums;
public enum KingDeeUtilType {
-// BD_MATERIAL(0, "鐗╂枡妗ｆ","BD_MATERIAL","","","",1),
-// BD_RRGANIZATION(2, "渚涘簲鍟�","BD_RRGANIZATION","","","",1),
-// PUR_RECEIVEBIll(3, "鏀舵枡鍗�","PUR_RECEIVEBIll","","","",1),
-// SAL_OUTSTOCK(7, "閿�鍞嚭搴撳崟","SAL_OUTSTOCK","FRealQty","","",0),
+ BD_MATERIAL(0, "鐗╂枡妗ｆ","BD_MATERIAL","","","",1),
+ BD_RRGANIZATION(2, "渚涘簲鍟�","BD_RRGANIZATION","","","",1),
+ PUR_RECEIVEBIll(3, "鏀舵枡鍗�","PUR_RECEIVEBIll","","","",1),
+ SAL_OUTSTOCK(7, "閿�鍞嚭搴撳崟","SAL_OUTSTOCK","FRealQty","","",0),
// STK_MisDelivery(19, "鍏朵粬鍑哄簱鍗�","STK_MisDelivery","FQty","","",0),
// STK_MISCELLANEOUS(18, "鍏朵粬鍏ュ簱鍗�","STK_MISCELLANEOUS","FQty","鍏朵粬鍏ュ簱鍗�","STK_MISCELLANEOUS",1),
// SAL_RETURNSTOCK(9, "閿�鍞��璐у崟","SAL_RETURNSTOCK","FRealQty","","",1),
-// PRD_PickMtrl(10, "鐢熶骇棰嗘枡鍗�","PRD_PickMtrl","","","",0),
+ PRD_PickMtrl(10, "鐢熶骇棰嗘枡鍗�","PRD_PickMtrl","","","",0),
// PRD_ReturnMtrl(12, "鐢熶骇閫�鏂欏崟","PRD_ReturnMtrl","FQty","","",1),
// PRD_FeedMtrl(14, "鐢熶骇琛ユ枡鍗�","PRD_FeedMtrl","FActualQty","","",0),
PRD_MORPT(16, "鐢熶骇姹囨姤鍗�","PRD_MORPT","FFinishQty","鐢熶骇鍏ュ簱鍗�","PRD_INSTOCK",1),
--
Gitblit v1.9.1