From fffcf8f632eb551f11d018184547ce01dcc4907f Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期一, 23 十二月 2024 08:13:58 +0800
Subject: [PATCH] 完善erp上报流程
---
src/main/resources/mapper/OrderMapper.xml | 52 +++++++++
src/main/java/com/zy/asrs/task/kingdee/PushDowmOrderSyncScheduler.java | 2
src/main/java/com/zy/asrs/service/OrderService.java | 15 ++
src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java | 15 ++
src/main/java/com/zy/asrs/entity/OrderDetl.java | 4
src/main/java/com/zy/asrs/task/kingdee/handler/SaveOrderSyncHandler.java | 26 ++--
src/main/java/com/zy/asrs/task/OrderMoveHistoryScheduler.java | 2
src/main/java/com/zy/asrs/task/kingdee/handler/SubmitOrderSyncHandler.java | 18 ++-
src/main/java/com/zy/erp/kingdee/enums/KingDeeUtilType.java | 4
src/main/java/com/zy/asrs/entity/Order.java | 10 +
src/main/java/com/zy/asrs/task/kingdee/handler/PushDowmOrderSyncHandler.java | 28 ++---
src/main/java/com/zy/asrs/task/kingdee/handler/ReviewOrderSyncHandler.java | 55 +++++++---
src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java | 29 +++++
src/main/java/com/zy/asrs/task/kingdee/ReviewOrderSyncScheduler.java | 2
src/main/java/com/zy/asrs/mapper/OrderMapper.java | 5 +
src/main/java/com/zy/asrs/task/kingdee/SubmitOrderSyncScheduler.java | 2
src/main/resources/application.yml | 8
17 files changed, 197 insertions(+), 80 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/Order.java b/src/main/java/com/zy/asrs/entity/Order.java
index 99abc64..b20d224 100644
--- a/src/main/java/com/zy/asrs/entity/Order.java
+++ b/src/main/java/com/zy/asrs/entity/Order.java
@@ -207,9 +207,9 @@
private String shipName;
/**
- * 鐗╂祦鍗曞彿
+ * 涓嬫帹璁㈠崟缂栧彿
*/
- @ApiModelProperty(value= "鐗╂祦鍗曞彿")
+ @ApiModelProperty(value= "涓嬫帹璁㈠崟缂栧彿")
@TableField("ship_code")
private String shipCode;
@@ -256,7 +256,11 @@
private Date updateTime;
/**
- * 澶囨敞
+ * 澶囨敞-涓婃姤鐘舵��
+ * 0.寰呬笂鎶�
+ * 1.涓嬫帹瀹屾垚
+ * 2.鎻愪氦瀹屾垚
+ * 3.瀹℃牳瀹屾垚
*/
@ApiModelProperty(value= "澶囨敞")
private String memo;
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetl.java b/src/main/java/com/zy/asrs/entity/OrderDetl.java
index 92345a0..39d5a98 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetl.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetl.java
@@ -193,9 +193,9 @@
private Double weight;
/**
- * 闀垮害
+ * 宸蹭笂鎶ユ暟閲�
*/
- @ApiModelProperty(value= "闀垮害")
+ @ApiModelProperty(value= "宸蹭笂鎶ユ暟閲�")
private Double length;
/**
diff --git a/src/main/java/com/zy/asrs/mapper/OrderMapper.java b/src/main/java/com/zy/asrs/mapper/OrderMapper.java
index b2c495e..1b30cdd 100644
--- a/src/main/java/com/zy/asrs/mapper/OrderMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/OrderMapper.java
@@ -17,9 +17,14 @@
int updateSettle(@Param("orderId")Long orderId, @Param("settle")Long settle, @Param("userId")Long userId);
List<Order> selectComplete();
+ List<Order> selectCompleteSave();
List<Order> selectComplete1();
List<Order> selectComplete2();
+ List<Order> selectCompleteMome0();
+ List<Order> selectCompleteMome1();
+ List<Order> selectCompleteMome2();
+ List<Order> selectCompleteMome3();
int addToLogTable(Order order);
Integer checkDetlWorkQtyLess0(@Param("orderNo") String orderNo);
diff --git a/src/main/java/com/zy/asrs/service/OrderService.java b/src/main/java/com/zy/asrs/service/OrderService.java
index ac7e83c..3261d8c 100644
--- a/src/main/java/com/zy/asrs/service/OrderService.java
+++ b/src/main/java/com/zy/asrs/service/OrderService.java
@@ -20,13 +20,24 @@
void remove(Long orderId);
- //瀹屾垚
+ //涓嬫帹
List<Order> selectComplete();
//淇濆瓨
- List<Order> selectComplete1();
+ List<Order> selectCompleteSave();
//鎻愪氦
+ List<Order> selectComplete1();
+ //瀹℃牳
+ List<Order> selectCompletemEmo0();
+
+ List<Order> selectCompletemEmo1();
+
+ List<Order> selectCompletemEmo2();
+
+ List<Order> selectCompletemEmo3();
+
List<Order> selectComplete2();
+
boolean addToLogTable(Order order);
void BackToInit(String orderNo);
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 86dd859..6e6f778 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
@@ -19,6 +19,7 @@
import org.springframework.stereotype.Service;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import java.util.Objects;
@@ -81,6 +82,7 @@
orderDetlService.updateById(orderDetl);
}
}
+ order.setMemo("0");
if (!this.updateSettle(order.getId(), 4L, null)) {
throw new CoolException("淇敼璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戠姸鎬佷负宸插畬鎴愬け璐�");
}
@@ -152,8 +154,33 @@
}
@Override
+ public List<Order> selectCompleteSave() {
+ return this.baseMapper.selectCompleteSave();
+ }
+
+ @Override
public List<Order> selectComplete1() {
return this.baseMapper.selectComplete1();
+ }
+
+ @Override
+ public List<Order> selectCompletemEmo0() {
+ return this.baseMapper.selectCompleteMome0();
+ }
+
+ @Override
+ public List<Order> selectCompletemEmo1() {
+ return this.baseMapper.selectCompleteMome1();
+ }
+
+ @Override
+ public List<Order> selectCompletemEmo2() {
+ return this.baseMapper.selectCompleteMome2();
+ }
+
+ @Override
+ public List<Order> selectCompletemEmo3() {
+ return this.baseMapper.selectCompleteMome3();
}
@Override
@@ -216,7 +243,7 @@
@Override
public List<Order> selectToBeHistoryOrder(boolean isERP) {
- int settle = isERP ? 7 : 4;
+ int settle = isERP ? 8 : 4;
return this.baseMapper.selectToBeHistoryOrder(settle);
}
diff --git a/src/main/java/com/zy/asrs/task/OrderMoveHistoryScheduler.java b/src/main/java/com/zy/asrs/task/OrderMoveHistoryScheduler.java
index 2f1081a..730b720 100644
--- a/src/main/java/com/zy/asrs/task/OrderMoveHistoryScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderMoveHistoryScheduler.java
@@ -14,7 +14,7 @@
/**
* 灏嗗凡瀹屾垚order鍜宱rderDetl绉诲姩鍒發og琛�
*/
- @Scheduled(cron = "0/30 * * * * ?")
+// @Scheduled(cron = "0/30 * * * * ?")
public void execute(){
orderMoveHistoryHandler.start();
}
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 b2e80c5..b3daf48 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/PushDowmOrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/PushDowmOrderSyncScheduler.java
@@ -32,7 +32,7 @@
if(!PushDowmOrderSwitch){
return;
}
- List<Order> orders = orderService.selectComplete();
+ List<Order> orders = orderService.selectCompletemEmo0();
for (Order order : orders) {
try{
ReturnT<String> result = pushDowmOrderSyncHandler.start(order);
diff --git a/src/main/java/com/zy/asrs/task/kingdee/ReviewOrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/kingdee/ReviewOrderSyncScheduler.java
index 38c10e3..f74c57b 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/ReviewOrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/ReviewOrderSyncScheduler.java
@@ -35,7 +35,7 @@
if(!ReviewOrderSwitch){
return;
}
- List<Order> orders = orderService.selectComplete2();
+ List<Order> orders = orderService.selectCompletemEmo3();
for (Order order : orders) {
try{
ReturnT<String> result = reviewOrderSyncHandler.start(order);
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 6e57bd2..e21aeaa 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java
@@ -1,5 +1,6 @@
package com.zy.asrs.task.kingdee;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.zy.asrs.entity.Order;
import com.zy.asrs.service.OrderService;
import com.zy.asrs.task.core.ReturnT;
@@ -34,12 +35,18 @@
if(!SaveOrderSwitch){
return;
}
- List<Order> orders = orderService.selectComplete();
+ List<Order> orders = orderService.selectCompletemEmo1();
for (Order order : orders) {
try{
- ReturnT<String> result = saveOrderSyncHandler.start(order);
- if (!result.isSuccess()) {
- log.error("鍗曟嵁[orderNo={}]淇濆瓨鑷砮rp澶辫触", order.getOrderNo());
+ if(order.getSettle()==4){
+ order.setMemo("2");
+ order.setUpdateTime(new Date());
+ orderService.update(order,new EntityWrapper<Order>().eq("order_no",order.getOrderNo()));
+ }else{
+ ReturnT<String> result = saveOrderSyncHandler.start(order);
+ if (!result.isSuccess()) {
+ log.error("鍗曟嵁[orderNo={}]淇濆瓨鑷砮rp澶辫触", order.getOrderNo());
+ }
}
}catch (Exception e){
Order order1 = orderService.selectById(order.getId());
diff --git a/src/main/java/com/zy/asrs/task/kingdee/SubmitOrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/kingdee/SubmitOrderSyncScheduler.java
index 64fff3e..37a7edb 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/SubmitOrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/SubmitOrderSyncScheduler.java
@@ -36,7 +36,7 @@
if(!SubmitOrderSwitch){
return;
}
- List<Order> orders = orderService.selectComplete1();
+ List<Order> orders = orderService.selectCompletemEmo2();
for (Order order : orders) {
try{
ReturnT<String> result = submitOrderSyncHandler.start(order);
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 95b6e28..56f35dc 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
@@ -69,12 +69,12 @@
}
KingDeeUtilType kingDeeUtilType = KingDeeUtilType.get(docType.getDocName());
- if (kingDeeUtilType.entryId>1){
- Order order1 = orderService.selectById(order.getId());
- order1.setUpdateTime(new Date());
- orderService.updateById(order1);
- return SUCCESS;
- }
+// if (kingDeeUtilType.entryId>1){
+// Order order1 = orderService.selectById(order.getId());
+// order1.setUpdateTime(new Date());
+// orderService.updateById(order1);
+// return SUCCESS;
+// }
//鏉′欢鎷兼帴
log.info("鏉′欢鎷兼帴");
String entryIds = null;
@@ -131,21 +131,19 @@
JsonNode rootNode = objectMapper.readTree(response);
bool = rootNode.get("Result").get("ResponseStatus").get("IsSuccess").asBoolean();
- //涓嬫帹瀹屾垚鍘熻鍗�4杞�6 6.涓婃姤瀹屾垚
+ //涓嬫帹瀹屾垚鍘熻鍗�0杞�1 1.涓嬫帹瀹屾垚
if(bool){
+ //鑾峰彇涓嬫帹璁㈠崟鍙�
+ String number=rootNode.get("Result").get("ResponseStatus").get("SuccessEntitys").get(0).get("Number").asText();
success = true;
- order.setSettle(6L);
+// order.setSettle(6L);
+ order.setMemo("1");
+ order.setShipCode(number);//涓嬫帹璁㈠崟鍙�
order.setUpdateTime(new Date());
+
orderService.update(order,new EntityWrapper<Order>().eq("order_no",order.getOrderNo()));
}
}
-
- if (!bool1.equals("true") || !bool){
- order.setSettle(7L);
- order.setUpdateTime(new Date());
- orderService.update(order,new EntityWrapper<Order>().eq("order_no",order.getOrderNo()));
- }
-
} catch (Exception e) {
log.info("涓嬫帹error:"+response);
log.error("fail", e);
diff --git a/src/main/java/com/zy/asrs/task/kingdee/handler/ReviewOrderSyncHandler.java b/src/main/java/com/zy/asrs/task/kingdee/handler/ReviewOrderSyncHandler.java
index 5a4692d..48b8312 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/handler/ReviewOrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/handler/ReviewOrderSyncHandler.java
@@ -4,10 +4,14 @@
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.entity.WrkDetl;
+import com.zy.asrs.mapper.OrderDetlMapper;
import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.DocTypeService;
import com.zy.asrs.service.OrderService;
@@ -21,9 +25,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Set;
+import java.util.*;
/**
* Created by vincent on 2023/10/21
@@ -47,6 +49,8 @@
private DocTypeService docTypeService;
@Autowired
private LoginAuthenticationHandler loginAuthenticationHandler;
+ @Autowired
+ private OrderDetlMapper orderDetlMapper;
@Transactional
public ReturnT<String> start(Order order) {
@@ -60,11 +64,11 @@
//鏉′欢鎷兼帴
JSONObject dataJsonObject = new JSONObject();
- dataJsonObject.put("Numbers",order.getOrderNo());
+ dataJsonObject.put("Numbers", "CGTL10124120003");
JSONObject jsonObject = new JSONObject();
jsonObject.put("data", dataJsonObject);
- jsonObject.put("FormId",kingDeeUtilType.formId);
+ jsonObject.put("FormId", kingDeeUtilType.ruleId);
String add = jsonObject.toJSONString();
//涓婃姤
String response = "";
@@ -82,19 +86,33 @@
.doPost();
JSONObject data = JSON.parseObject(response);
Object IsSuccess = findValueByKey(JSON.parseObject(response), "IsSuccess");
- String bool1=IsSuccess.toString();
+ String bool1 = IsSuccess.toString();
- if(bool1.equals("true")){
- ObjectMapper objectMapper = new ObjectMapper();
+ if (bool1.equals("true")) {
+ ObjectMapper objectMapper = new ObjectMapper();
JsonNode rootNode = objectMapper.readTree(response);
boolean bool = rootNode.get("Result").get("ResponseStatus").get("IsSuccess").asBoolean();
- log.info("瀹℃牳bool:"+bool);
- //瀹℃牳瀹屾垚鍘熻鍗�6杞�7 7.瀹℃牳瀹屾垚
- if(bool){
+ log.info("瀹℃牳bool:" + bool);
+ //瀹℃牳瀹屾垚鍘熻鍗�2杞�3 3.瀹℃牳瀹屾垚
+ if (bool) {
success = true;
- order.setSettle(10L);
+ order.setMemo("3");//瀹℃牳瀹屾垚
order.setUpdateTime(new Date());
- orderService.update(order,new EntityWrapper<Order>().eq("order_no",order.getOrderNo()));
+
+
+ //鍒ゆ柇璁㈠崟鏄惁宸茬粡鍏ㄩ儴鍋氬畬
+ List<OrderDetl> orderDetls = orderDetlMapper.selectList(new EntityWrapper<OrderDetl>().eq("order_id", order.getId()));
+ boolean complete = true;
+ for (OrderDetl orderDetl : orderDetls) {
+ if (orderDetl.getAnfme() > orderDetl.getQty()) {
+ complete = false;
+ break;
+ }
+ }
+ if(complete){
+ order.setSettle(8L);
+ }
+ orderService.update(order, new EntityWrapper<Order>().eq("order_no", order.getOrderNo()));
}
}
} catch (Exception e) {
@@ -105,8 +123,8 @@
try {
// 淇濆瓨鎺ュ彛鏃ュ織
apiLogService.save(
- "瀹℃牳",
- URL+ outaddressAudit,
+ " 瀹℃牳",
+ URL + outaddressAudit,
null,
"127.0.0.1",
add,
@@ -119,6 +137,7 @@
}
return SUCCESS;
}
+
public static Object findValueByKey(JSONObject json, String key) {
Set<String> keySet = json.keySet();
for (String k : keySet) {
@@ -129,13 +148,13 @@
int size = ((JSONArray) v).size();
for (int i = 0; i <= size - 1; i++) {
Object result = findValueByKey((JSONObject) ((JSONArray) v).get(i), key);
- if (result != null){
+ if (result != null) {
return result;
}
}
- } else if (v instanceof JSONObject){
+ } else if (v instanceof JSONObject) {
Object result = findValueByKey((JSONObject) v, key);
- if (result != null){
+ if (result != null) {
return result;
}
}
diff --git a/src/main/java/com/zy/asrs/task/kingdee/handler/SaveOrderSyncHandler.java b/src/main/java/com/zy/asrs/task/kingdee/handler/SaveOrderSyncHandler.java
index 66a804a..af4cb64 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/handler/SaveOrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/handler/SaveOrderSyncHandler.java
@@ -66,17 +66,17 @@
return SUCCESS;
}
KingDeeUtilType kingDeeUtilType = KingDeeUtilType.get(docType.getDocName());
- if (kingDeeUtilType.entryId!=2){
- return SUCCESS;
- }
+// if (kingDeeUtilType.entryId!=2){
+// return SUCCESS;
+// }
Date now = new Date();
//鏉′欢鎷兼帴
JSONObject jsonObjectFBillTypeID = new JSONObject();
JSONObject jsonObjectFPickerId = new JSONObject();
if (kingDeeUtilType.pakIn==1){
- jsonObjectFBillTypeID.put("FNUMBER","QTRKD01_SYS");
+ jsonObjectFBillTypeID.put("FNUMBER","TLD01_SYS");
}else {
- jsonObjectFBillTypeID.put("FNUMBER","QTCKD01_SYS");
+ jsonObjectFBillTypeID.put("FNUMBER","TLD01_SYS");
jsonObjectFPickerId.put("FStaffNumber","X0103_GLGW074_1");
}
@@ -153,13 +153,13 @@
Object IsSuccess = findValueByKey(JSON.parseObject(response), "IsSuccess");
String bool1=IsSuccess.toString();
boolean bool = false;
- //淇濆瓨瀹屾垚鍘熻鍗�4杞�5 6.淇濆瓨瀹屾垚
+ //淇濆瓨瀹屾垚鍘熻鍗�5杞�6 6.淇濆瓨瀹屾垚
if(bool1.equals("true")){
ObjectMapper objectMapper = new ObjectMapper();
JsonNode rootNode = objectMapper.readTree(response);
bool = rootNode.get("Result").get("ResponseStatus").get("IsSuccess").asBoolean();
- log.info("瀹℃牳bool:"+bool);
- //鎻愪氦瀹屾垚鍘熻鍗�4杞�6 6.涓婃姤瀹屾垚
+ log.info("淇濆瓨bool:"+bool);
+ //鎻愪氦瀹屾垚鍘熻鍗�5杞�6 6.涓婃姤瀹屾垚
if(bool){
success = true;
order.setSettle(6L);
@@ -168,11 +168,11 @@
}
}
- if (!bool1.equals("true") || !bool){
- order.setSettle(7L);
- order.setUpdateTime(new Date());
- orderService.update(order,new EntityWrapper<Order>().eq("order_no",order.getOrderNo()));
- }
+// if (!bool1.equals("true") || !bool){
+// order.setSettle(7L);
+// order.setUpdateTime(new Date());
+// orderService.update(order,new EntityWrapper<Order>().eq("order_no",order.getOrderNo()));
+// }
} catch (Exception e) {
log.error("fail", e);
diff --git a/src/main/java/com/zy/asrs/task/kingdee/handler/SubmitOrderSyncHandler.java b/src/main/java/com/zy/asrs/task/kingdee/handler/SubmitOrderSyncHandler.java
index 46883a2..7bcbc34 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/handler/SubmitOrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/handler/SubmitOrderSyncHandler.java
@@ -57,15 +57,16 @@
return SUCCESS;
}
KingDeeUtilType kingDeeUtilType = KingDeeUtilType.get(docType.getDocName());
- if (kingDeeUtilType.entryId!=2){
- return SUCCESS;
- }
+// if (kingDeeUtilType.entryId!=2){
+// return SUCCESS;
+// }
//鏉′欢鎷兼帴
JSONObject jsonObject = new JSONObject();
- jsonObject.put("Numbers",order.getOrderNo());
+// jsonObject.put("Ids","100083");
+ jsonObject.put("Numbers", order.getOrderNo());
JSONObject jsonObject1 = new JSONObject();
jsonObject1.put("data", jsonObject);
- jsonObject1.put("FormId",kingDeeUtilType.correspondingFormId);
+ jsonObject1.put("FormId",kingDeeUtilType.ruleId);
String add = jsonObject1.toJSONString();
//涓婃姤
String response = "";
@@ -84,16 +85,17 @@
// JSONObject data = JSON.parseObject(response);
Object IsSuccess = findValueByKey(JSON.parseObject(response), "IsSuccess");
String bool1=IsSuccess.toString();
- //鎻愪氦瀹屾垚鍘熻鍗�8杞�6
+ //鎻愪氦瀹屾垚鍘熻鍗�6杞�7
if(bool1.equals("true")){
ObjectMapper objectMapper = new ObjectMapper();
JsonNode rootNode = objectMapper.readTree(response);
boolean bool = rootNode.get("Result").get("ResponseStatus").get("IsSuccess").asBoolean();
log.info("瀹℃牳bool:"+bool);
- //鎻愪氦瀹屾垚鍘熻鍗�5杞�6 6.鎻愪氦瀹屾垚
+ //鎻愪氦瀹屾垚鍘熻鍗�1杞�2 2.鎻愪氦瀹屾垚
if(bool){
success = true;
- order.setSettle(5L);
+// order.setSettle(7L);
+ order.setMemo("2");
order.setUpdateTime(new Date());
orderService.update(order,new EntityWrapper<Order>().eq("order_no",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 3337b5e..ec1dfed 100644
--- a/src/main/java/com/zy/erp/kingdee/enums/KingDeeUtilType.java
+++ b/src/main/java/com/zy/erp/kingdee/enums/KingDeeUtilType.java
@@ -9,7 +9,7 @@
/*
* 閫�璐ч�氱煡鍗曡嚦閿�鍞��璐у崟鍗曟嵁鍞竴鏍囪瘑锛氫竴绾э細SalReturnNotice-SalReturnstock 浜岀骇锛歛0ab8e5c-5224-4ba2-b31f-b061e64aa1a2
* */
- SAL_RETURNNOTICE(3, "閫�璐ч�氱煡鍗�-閿�鍞��璐у崟","SAL_RETURNNOTICE","","閿�鍞��璐у崟","SAL_RETURNSTOCK",0,"SalReturnNotice-SalReturnstock",0),
+ SAL_RETURNNOTICE(3, "閫�璐ч�氱煡鍗�-閿�鍞��璐у崟","SAL_RETURNNOTICE","","閿�鍞��璐у崟","SAL_RETURNSTOCK",1,"SalReturnNotice-SalReturnstock",0),
/*
* 閲囪喘鏀舵枡鍗曡嚦閲囪喘鍏ュ簱鍗曞敮涓�鏍囪瘑:涓�绾э細PUR_ReceiveBill-STK_InStock 浜岀骇锛歜60e30ca-634c-4f92-b874-db9837496705
* */
@@ -17,7 +17,7 @@
/*
* 閫�鏂欑敵璇峰崟鑷抽噰璐��鏂欏崟鍗曟嵁鍞竴鏍囪瘑:PUR_MRAPP-PUR_MRB
* */
- PUR_MRAPP(5, "閫�鏂欑敵璇峰崟-閲囪喘閫�鏂欏崟","PUR_MRAPP","","閲囪喘閫�鏂欏崟","PUR_MRB",1,"PUR_MRAPP-PUR_MRB",0),
+ PUR_MRAPP(5, "閫�鏂欑敵璇峰崟-閲囪喘閫�鏂欏崟","PUR_MRAPP","","閲囪喘閫�鏂欏崟","TLD01_SYS",1,"PUR_MRB",0),
/*
* 鐢熶骇鐢ㄦ枡娓呭崟鍒扮敓浜ч鏂欏崟鍞竴鏍囪瘑锛氫竴绾э細PRD_PPBOM2PICKMTRL_NORMAL 浜岀骇锛�3539ff08-0c46-435d-a8cd-b6308b0b57b5
* */
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 5eaa14e..be1f411 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -69,8 +69,8 @@
ReviewOrderSwitch: true
#2鎻愪氦鍗曟嵁寮�鍏�
SaveOrderSwitch: true
- #1淇濆瓨
- SubmitOrderSwitch: false
+ #鎻愪氦
+ SubmitOrderSwitch: true
#涓嬫帹鍗曟嵁寮�鍏�
PushDowmOrderSwitch: true
# 鍦板潃
@@ -84,9 +84,9 @@
pushDowmAudit: K3cloud/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Push.common.kdsvc
#缁撴灉涓婃姤锛堜繚瀛橈級鍗曞湴鍧�
outaddressSave: K3CLOUD/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Save.common.kdsvc
- #缁撴灉涓婃姤锛堟彁浜わ級鍗曞湴鍧� 绫冲鏃犵敤
+ #缁撴灉涓婃姤锛堟彁浜わ級鍗曞湴鍧�
outaddressSubmit: K3Cloud/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit.common.kdsvc
- #缁撴灉涓婃姤锛堝鏍革級鍗曞湴鍧� 绫冲鏃犵敤
+ #缁撴灉涓婃姤锛堝鏍革級鍗曞湴鍧�
outaddressAudit: K3CLOUD/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Audit.common.kdsvc
# 鐧诲綍璐﹀彿绠＄悊
login :
diff --git a/src/main/resources/mapper/OrderMapper.xml b/src/main/resources/mapper/OrderMapper.xml
index 7658a08..aa68d52 100644
--- a/src/main/resources/mapper/OrderMapper.xml
+++ b/src/main/resources/mapper/OrderMapper.xml
@@ -68,16 +68,16 @@
order by update_time asc
</select>
- <select id="selectComplete1" resultMap="BaseResultMap">
+ <select id="selectCompleteSave" resultMap="BaseResultMap">
select top 5 *
from man_order
where 1=1
- and settle = 5
- and status = 1
+ and settle = 5
+ and status = 1
order by update_time asc
</select>
- <select id="selectComplete2" resultMap="BaseResultMap">
+ <select id="selectComplete1" resultMap="BaseResultMap">
select top 5 *
from man_order
where 1=1
@@ -86,6 +86,50 @@
order by update_time asc
</select>
+ <select id="selectComplete2" resultMap="BaseResultMap">
+ select top 5 *
+ from man_order
+ where 1=1
+ and settle = 7
+ and status = 1
+ order by update_time asc
+ </select>
+
+ <select id="selectCompleteMome0" resultMap="BaseResultMap">
+ select top 5 *
+ from man_order
+ where 1=1
+ and memo = '0'
+ and status = 1
+ order by update_time asc
+ </select>
+
+ <select id="selectCompleteMome1" resultMap="BaseResultMap">
+ select top 5 *
+ from man_order
+ where 1=1
+ and memo = '1'
+ and status = 1
+ order by update_time asc
+ </select>
+
+ <select id="selectCompleteMome2" resultMap="BaseResultMap">
+ select top 5 *
+ from man_order
+ where 1=1
+ and memo = '2'
+ and status = 1
+ order by update_time asc
+ </select>
+
+ <select id="selectCompleteMome3" resultMap="BaseResultMap">
+ select top 5 *
+ from man_order
+ where 1=1
+ and memo = '3'
+ and status = 1
+ 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)
</select>
--
Gitblit v1.9.1