From 83c9330f576c23aade710bcd996dedd19534e213 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期三, 27 十二月 2023 12:38:09 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/OrderMapper.xml | 2
src/main/java/com/zy/asrs/task/kingdee/PushDowmOrderSyncScheduler.java | 13 +++++-
src/main/java/com/zy/asrs/entity/param/OpenOrderPakinJDParam.java | 5 +-
src/main/java/com/zy/common/model/DetlDto.java | 2 +
src/main/java/com/zy/erp/kingdee/enums/KingDeeUtilType.java | 50 ++++++++++++------------
src/main/java/com/zy/asrs/task/kingdee/handler/PushDowmOrderSyncHandler.java | 41 ++++++++++++++++++--
6 files changed, 77 insertions(+), 36 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/param/OpenOrderPakinJDParam.java b/src/main/java/com/zy/asrs/entity/param/OpenOrderPakinJDParam.java
index 12dd016..6d689bf 100644
--- a/src/main/java/com/zy/asrs/entity/param/OpenOrderPakinJDParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/OpenOrderPakinJDParam.java
@@ -19,7 +19,6 @@
private String createDate;
- private String number;//琛屽彿
private String type;//绫诲瀷 (1銆佹暣鍗曚笂鎶� 2銆佽鍙蜂笂鎶�)
private List<DetlDto2> matList;
@@ -37,15 +36,17 @@
private Double anfme;
private String owner;
+ private String origin;
public DetlDto2(){}
- public DetlDto2(String matnr,String maktx,String batch,String specs,Double anfme,String owner){
+ public DetlDto2(String matnr,String maktx,String batch,String specs,Double anfme,String owner,String origin){
this.matnr=matnr;
this.maktx=maktx;
this.batch=batch;
this.specs=specs;
this.anfme=anfme;
this.owner=owner;
+ this.origin=origin;
}
}
diff --git a/src/main/java/com/zy/asrs/task/kingdee/PushDowmOrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/kingdee/PushDowmOrderSyncScheduler.java
index 147edca..b2e80c5 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/PushDowmOrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/PushDowmOrderSyncScheduler.java
@@ -10,6 +10,7 @@
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
+import java.util.Date;
import java.util.List;
/*
@@ -33,9 +34,15 @@
}
List<Order> orders = orderService.selectComplete();
for (Order order : orders) {
- ReturnT<String> result = pushDowmOrderSyncHandler.start(order);
- if (!result.isSuccess()) {
- log.error("鍗曟嵁[orderNo={}]鎻愪氦鑷砮rp澶辫触", order.getOrderNo());
+ try{
+ ReturnT<String> result = pushDowmOrderSyncHandler.start(order);
+ if (!result.isSuccess()) {
+ log.error("鍗曟嵁[orderNo={}]鎻愪氦鑷砮rp澶辫触", order.getOrderNo());
+ }
+ }catch (Exception e){
+ Order order1 = orderService.selectById(order.getId());
+ order1.setUpdateTime(new Date());
+ orderService.updateById(order1);
}
}
}
diff --git a/src/main/java/com/zy/asrs/task/kingdee/handler/PushDowmOrderSyncHandler.java b/src/main/java/com/zy/asrs/task/kingdee/handler/PushDowmOrderSyncHandler.java
index c9e9340..bd043cb 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/handler/PushDowmOrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/handler/PushDowmOrderSyncHandler.java
@@ -4,10 +4,15 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
import com.zy.asrs.entity.DocType;
import com.zy.asrs.entity.Order;
+import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.DocTypeService;
+import com.zy.asrs.service.OrderDetlService;
import com.zy.asrs.service.OrderService;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
@@ -19,7 +24,9 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.util.Date;
import java.util.HashMap;
+import java.util.List;
import java.util.Set;
/**
@@ -38,6 +45,8 @@
@Autowired
private OrderService orderService;
+ @Autowired
+ private OrderDetlService orderDetlService;
@Autowired
private ApiLogService apiLogService;
@Autowired
@@ -62,9 +71,25 @@
//鏉′欢鎷兼帴
log.info("鏉′欢鎷兼帴");
+ String entryIds = null;
+// if (kingDeeUtilType.entryId==1){
+// List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
+// for (OrderDetl orderDetl:orderDetls){
+// if (Cools.isEmpty(entryIds)){
+// entryIds = orderDetl.getOrigin();
+// }else {
+// entryIds = entryIds+"," +orderDetl.getOrigin();
+// }
+// }
+// orderNoS = "";
+// }
+ if (Cools.isEmpty(entryIds)){
+ entryIds = "";
+ }
+
JSONObject dataJsonObject = new JSONObject();
dataJsonObject.put("Numbers",orderNoS);
- dataJsonObject.put("EntryIds","");
+ dataJsonObject.put("EntryIds",entryIds);
dataJsonObject.put("RuleId",kingDeeUtilType.ruleId);
dataJsonObject.put("TargetFormId",kingDeeUtilType.correspondingFormId);
@@ -90,14 +115,20 @@
.setHttps(true)
.build()
.doPost();
- JSONObject data = JSON.parseObject(response);
+// JSONObject data = JSON.parseObject(response);
log.info("涓嬫帹response:"+response);
- Object IsSuccess = findValueByKey(JSON.parseObject(response), "IsSuccess");
- String bool=IsSuccess.toString();
+// Object IsSuccess = findValueByKey(JSON.parseObject(response), "IsSuccess");
+// String bool=IsSuccess.toString();
+ ObjectMapper objectMapper = new ObjectMapper();
+ JsonNode rootNode = objectMapper.readTree(response);
+ boolean bool = rootNode.get("Result").get("ResponseStatus").get("IsSuccess").asBoolean();
+ log.info("涓嬫帹bool:"+bool);
+
//涓嬫帹瀹屾垚鍘熻鍗�4杞�6 6.涓婃姤瀹屾垚
- if(bool.equals("true")){
+ if(bool){
success = true;
order.setSettle(6L);
+ order.setUpdateTime(new Date());
orderService.update(order,new EntityWrapper<Order>().eq("order_no",order.getOrderNo()));
}
} catch (Exception e) {
diff --git a/src/main/java/com/zy/common/model/DetlDto.java b/src/main/java/com/zy/common/model/DetlDto.java
index b0b3fbb..e34433a 100644
--- a/src/main/java/com/zy/common/model/DetlDto.java
+++ b/src/main/java/com/zy/common/model/DetlDto.java
@@ -23,6 +23,7 @@
private int owner;
private String ownerName;
+ private String orgin;
private int payment;
@@ -36,6 +37,7 @@
this.batch=detlDto2.getBatch();
this.anfme=detlDto2.getAnfme();
this.ownerName=detlDto2.getOwner();
+ this.orgin=detlDto2.getOrigin();
this.payment=0;
}
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 1b7d90e..4943493 100644
--- a/src/main/java/com/zy/erp/kingdee/enums/KingDeeUtilType.java
+++ b/src/main/java/com/zy/erp/kingdee/enums/KingDeeUtilType.java
@@ -2,58 +2,57 @@
public enum KingDeeUtilType {
- SAL_DELIVERYNOTICE(1, "鍙戣揣閫氱煡鍗�-閿�鍞嚭搴撳崟","SAL_DELIVERYNOTICE","FQty","閿�鍞嚭搴撳崟","SAL_OUTSTOCK",0,"DeliveryNotice-Outstock"),
+ SAL_DELIVERYNOTICE(1, "鍙戣揣閫氱煡鍗�-閿�鍞嚭搴撳崟","SAL_DELIVERYNOTICE","FQty","閿�鍞嚭搴撳崟","SAL_OUTSTOCK",0,"DeliveryNotice-Outstock",0),
//绫冲闈掑矝
- STK_OutStockApply30(2, "璇曠敤鍝佸彂璐ч�氱煡鍗�-鍏朵粬鍑哄簱鍗�","SAL_DELIVERYNOTICE","","鍏朵粬鍑哄簱鍗�","STK_MisDelivery",0,"731ce15d-c58d-4c21-96f9-d121c0a7b255"),
+ STK_OutStockApply30(2, "璇曠敤鍝佸彂璐ч�氱煡鍗�-鍏朵粬鍑哄簱鍗�","SAL_DELIVERYNOTICE","","鍏朵粬鍑哄簱鍗�","STK_MisDelivery",0,"731ce15d-c58d-4c21-96f9-d121c0a7b255",0),
/*
* 閫�璐ч�氱煡鍗曡嚦閿�鍞��璐у崟鍗曟嵁鍞竴鏍囪瘑锛氫竴绾э細SalReturnNotice-SalReturnstock 浜岀骇锛歛0ab8e5c-5224-4ba2-b31f-b061e64aa1a2
* */
- SAL_RETURNNOTICE(3, "閫�璐ч�氱煡鍗�-閿�鍞��璐у崟","SAL_RETURNNOTICE","","閿�鍞��璐у崟","SAL_RETURNSTOCK",0,"SalReturnNotice-SalReturnstock"),
+ SAL_RETURNNOTICE(3, "閫�璐ч�氱煡鍗�-閿�鍞��璐у崟","SAL_RETURNNOTICE","","閿�鍞��璐у崟","SAL_RETURNSTOCK",0,"SalReturnNotice-SalReturnstock",0),
/*
* 閲囪喘鏀舵枡鍗曡嚦閲囪喘鍏ュ簱鍗曞敮涓�鏍囪瘑:涓�绾э細PUR_ReceiveBill-STK_InStock 浜岀骇锛歜60e30ca-634c-4f92-b874-db9837496705
* */
- PUR_ReceiveBill(4, "鏀舵枡閫氱煡鍗�-閲囪喘鍏ュ簱鍗�","PUR_ReceiveBill","","閲囪喘鍏ュ簱鍗�","STK_InStock",1,"PUR_ReceiveBill-STK_InStock"),
+ PUR_ReceiveBill(4, "鏀舵枡閫氱煡鍗�-閲囪喘鍏ュ簱鍗�","PUR_ReceiveBill","","閲囪喘鍏ュ簱鍗�","STK_InStock",1,"PUR_ReceiveBill-STK_InStock",0),
/*
* 閫�鏂欑敵璇峰崟鑷抽噰璐��鏂欏崟鍗曟嵁鍞竴鏍囪瘑:PUR_MRAPP-PUR_MRB
* */
- PUR_MRAPP(5, "閫�鏂欑敵璇峰崟-閲囪喘閫�鏂欏崟","PUR_MRAPP","","閲囪喘閫�鏂欏崟","PUR_MRB",1,"PUR_MRAPP-PUR_MRB"),
+ PUR_MRAPP(5, "閫�鏂欑敵璇峰崟-閲囪喘閫�鏂欏崟","PUR_MRAPP","","閲囪喘閫�鏂欏崟","PUR_MRB",1,"PUR_MRAPP-PUR_MRB",0),
/*
* 鐢熶骇鐢ㄦ枡娓呭崟鍒扮敓浜ч鏂欏崟鍞竴鏍囪瘑锛氫竴绾э細PRD_PPBOM2PICKMTRL_NORMAL 浜岀骇锛�3539ff08-0c46-435d-a8cd-b6308b0b57b5
* */
- PRD_PPBOM1(6, "鐢熶骇鐢ㄦ枡娓呭崟-鐢熶骇棰嗘枡鍗�","PRD_PPBOM","","鐢熶骇棰嗘枡鍗�","PRD_PickMtrl",0,"PRD_PPBOM2PICKMTRL_NORMAL"),
+ PRD_PPBOM1(6, "鐢熶骇鐢ㄦ枡娓呭崟-鐢熶骇棰嗘枡鍗�","PRD_PPBOM","","鐢熶骇棰嗘枡鍗�","PRD_PickMtrl",0,"PRD_PPBOM2PICKMTRL_NORMAL",1),
- PRD_PPBOM2(7, "鐢熶骇鐢ㄦ枡娓呭崟-鐢熶骇琛ユ枡鍗�","PRD_PPBOM","","鐢熶骇琛ユ枡鍗�","PRD_FeedMtrl",1,"PRD_PPBOM2FEEDMTRL"),
+ PRD_PPBOM2(7, "鐢熶骇鐢ㄦ枡娓呭崟-鐢熶骇琛ユ枡鍗�","PRD_PPBOM","","鐢熶骇琛ユ枡鍗�","PRD_FeedMtrl",1,"PRD_PPBOM2FEEDMTRL",1),
- PRD_PPBOM3(8, "鐢熶骇鐢ㄦ枡娓呭崟-鐢熶骇閫�鏂欏崟","PRD_PPBOM","","鐢熶骇閫�鏂欏崟","PRD_ReturnMtrl",1,"PRD_PPBOM2RETURNMTRL"),
+ PRD_PPBOM3(8, "鐢熶骇鐢ㄦ枡娓呭崟-鐢熶骇閫�鏂欏崟","PRD_PPBOM","","鐢熶骇閫�鏂欏崟","PRD_ReturnMtrl",1,"PRD_PPBOM2RETURNMTRL",1),
- PRD_MO(9, "鐢熶骇璁㈠崟-鐢熶骇鍏ュ簱鍗�","PRD_MO","","鐢熶骇鍏ュ簱鍗�","PRD_INSTOCK",1,"PRD_MO2INSTOCK"),
+ PRD_MO(9, "鐢熶骇璁㈠崟-鐢熶骇鍏ュ簱鍗�","PRD_MO","","鐢熶骇鍏ュ簱鍗�","PRD_INSTOCK",1,"PRD_MO2INSTOCK",0),
- PRD_MORPT(10, "鐢熶骇姹囨姤鍗�-鐢熶骇鍏ュ簱鍗�","PRD_MORPT","","鐢熶骇鍏ュ簱鍗�","PRD_INSTOCK",1,"PRD_MORPT2INSTOCK"),
+ PRD_MORPT(10, "鐢熶骇姹囨姤鍗�-鐢熶骇鍏ュ簱鍗�","PRD_MORPT","","鐢熶骇鍏ュ簱鍗�","PRD_INSTOCK",1,"PRD_MORPT2INSTOCK",0),
- STK_TRANSFERAPPLY(11, "璋冩嫧鐢宠鍗�-鐩存帴璋冩嫧鍗�","STK_TRANSFERAPPLY","","鐩存帴璋冩嫧鍗�","STK_TransferDirect",0,"StkTransferApphy-StkTransferDirect"),
+ STK_TRANSFERAPPLY1(11, "璋冩嫧鐢宠鍗�1-鐩存帴璋冩嫧鍗�","STK_TRANSFERAPPLY","","鐩存帴璋冩嫧鍗�","STK_TransferDirect",0,"StkTransferApphy-StkTransferDirect",1),
- STK_OutStockApply337(12, "鐮斿彂棰嗘枡鍑哄簱鐢宠鍗�-鐮斿彂棰嗘枡鍑哄簱鍗�","STK_OUTSTOCKAPPLY","","鐮斿彂棰嗘枡鍑哄簱鍗�","",0,"STK_OutstockApplyTosTK_MisDelivery"),
- STK_ASSEMBLY1(13, "缁勮鎷嗗嵏鍗�1","STK_ASSEMBLY","","","",1,""),
- STK_ASSEMBLY2(14, "缁勮鎷嗗嵏鍗�2","STK_ASSEMBLY","","","",0,""),
- SAL_RETURNNOTICE1(15, "鍏朵粬鍏ュ簱鍗�","SAL_RETURNNOTICE","","鍏朵粬鍏ュ簱鍗�","STK_MISCELLANEOUS",1,""),
- SAL_DELIVERYNOTICE2(16, "鍏朵粬鍑哄簱鍗�","SAL_DELIVERYNOTICE","","鍏朵粬鍑哄簱鍗�","SAL_DELIVERYNOTICE",0,""),
- PRD_PPBOM(17, "鐢熶骇鐢ㄦ枡娓呭崟-鐢熶骇鐢ㄦ枡娓呭崟鍙樻洿鍗�","PRD_PPBOM","","鐢熶骇棰嗘枡鍗�","PRD_PPBOMChange",1,"PRD_PPBOM2PPBOMCHANGE"),
-
-
-
-
+ STK_OutStockApply337(12, "鐮斿彂棰嗘枡鍑哄簱鐢宠鍗�-鐮斿彂棰嗘枡鍑哄簱鍗�","STK_OUTSTOCKAPPLY","","鐮斿彂棰嗘枡鍑哄簱鍗�","",0,"STK_OutstockApplyTosTK_MisDelivery",0),
+ STK_ASSEMBLY1(13, "缁勮鎷嗗嵏鍗�1","STK_ASSEMBLY","","","",1,"",0),
+ STK_ASSEMBLY2(14, "缁勮鎷嗗嵏鍗�2","STK_ASSEMBLY","","","",0,"",0),
+ SAL_RETURNNOTICE1(15, "鍏朵粬鍏ュ簱鍗�","SAL_RETURNNOTICE","","鍏朵粬鍏ュ簱鍗�","STK_MISCELLANEOUS",1,"",2),
+ SAL_DELIVERYNOTICE2(16, "鍏朵粬鍑哄簱鍗�","SAL_DELIVERYNOTICE","","鍏朵粬鍑哄簱鍗�","SAL_DELIVERYNOTICE",0,"",2),
+ PRD_PPBOM(17, "鐢熶骇鐢ㄦ枡娓呭崟-鐢熶骇鐢ㄦ枡娓呭崟鍙樻洿鍗�","PRD_PPBOM","","鐢熶骇棰嗘枡鍗�","PRD_PPBOMChange",1,"PRD_PPBOM2PPBOMCHANGE",2),
+ STK_TRANSFERAPPLY2(18, "璋冩嫧鐢宠鍗�2-鐩存帴璋冩嫧鍗�","STK_TRANSFERAPPLY","","鐩存帴璋冩嫧鍗�","STK_TransferDirect",0,"StkTransferApphy-StkTransferDirect",1),
+ STK_TRANSFERAPPLY3(19, "璋冩嫧鐢宠鍗�3-鐩存帴璋冩嫧鍗�","STK_TRANSFERAPPLY","","鐩存帴璋冩嫧鍗�","STK_TransferDirect",0,"StkTransferApphy-StkTransferDirect",1),
;
- public Integer id;
- public String desc;//绫诲瀷鍚嶇О
- public String formId;//鍗曟嵁绫诲瀷鍞竴缂栫爜
+ public Integer id;//鍞竴
+ public String desc;//绫诲瀷鍚嶇О 淇濇寔鍞竴
+ public String formId;//鍗曟嵁绫诲瀷
public String anfme;//鍗曟嵁鏁伴噺瀛楁鍚�
public String correspondingName;//鐩爣鍗曟嵁鏁伴噺瀛楁
public String correspondingFormId;//鐩爣formId 闈為粯璁や笅鎺ㄦ椂鍚敤 榛樿涓嬫帹鏃跺惎鐢╮uleId
public Integer pakIn; //鍑哄叆搴撴爣蹇�
public String ruleId;//鍗曟嵁杞崲鍞竴鏍囪瘑 闈為粯璁や笅鎺ㄦ椂鍚敤 榛樿涓嬫帹鏃跺惎鐢╟orrespondingFormId
+ public int entryId;//鍗曟嵁杞崲鍞竴鏍囪瘑 闈為粯璁や笅鎺ㄦ椂鍚敤 榛樿涓嬫帹鏃跺惎鐢╟orrespondingFormId
- KingDeeUtilType(Integer id, String desc,String formId,String anfme,String correspondingName,String correspondingFormId,int pakIn,String ruleId){
+ KingDeeUtilType(Integer id, String desc,String formId,String anfme,String correspondingName,String correspondingFormId,int pakIn,String ruleId,int entryId){
this.id = id;
this.desc = desc;
this.formId = formId;
@@ -62,6 +61,7 @@
this.correspondingFormId = correspondingFormId;
this.pakIn = pakIn; //1鍏ュ簱 0鍑哄簱
this.ruleId = ruleId;
+ this.entryId = entryId;
}
public static KingDeeUtilType get(Short id) {
diff --git a/src/main/resources/mapper/OrderMapper.xml b/src/main/resources/mapper/OrderMapper.xml
index 81c9c88..6a13a72 100644
--- a/src/main/resources/mapper/OrderMapper.xml
+++ b/src/main/resources/mapper/OrderMapper.xml
@@ -65,7 +65,7 @@
where 1=1
and settle = 4
and status = 1
- order by create_time asc
+ order by update_time asc
</select>
<select id="selectInOrOutOrders" resultMap="BaseResultMap">
SELECT * FROM man_order o left join man_doc_type d on o.doc_type = d.doc_id WHERE d.pakin = #{flag} and o.settle in (1,2)
--
Gitblit v1.9.1