From 54cce185f383849322d5cc309d2ee5d155d15915 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 15 十一月 2023 18:57:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
mes-plan/src/main/java/com/chinaztt/mes/plan/service/impl/CustomerOrderServiceImpl.java | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/mes-plan/src/main/java/com/chinaztt/mes/plan/service/impl/CustomerOrderServiceImpl.java b/mes-plan/src/main/java/com/chinaztt/mes/plan/service/impl/CustomerOrderServiceImpl.java
index 9f6bd8f..04fa92d 100644
--- a/mes-plan/src/main/java/com/chinaztt/mes/plan/service/impl/CustomerOrderServiceImpl.java
+++ b/mes-plan/src/main/java/com/chinaztt/mes/plan/service/impl/CustomerOrderServiceImpl.java
@@ -709,9 +709,6 @@
.contentType("application/json")
.header("Authorization", "Bearer " + token).form(map).execute().body();
JSONObject result = JSONObject.parseObject(str);
- log.info("涓昏〃闀垮害============================================>"+result.getJSONArray("data").size());
- //jsonArray.forEach();
- //return null;
//涓昏〃鍙傛暟琛�
List<OrderParam> orderParams = orderParamService.list();
if (result.getInteger("code") == 0) {
@@ -836,7 +833,7 @@
customerOrder = new CustomerOrder();
}
//濡傛灉杩欎釜鍗曞瓙鍦∣TC涓彇娑堢姸鎬� 閭ｅ氨鍒犻櫎
- if (otcOrderStatus.equals("宸插彇娑�")) {
+ if (otcOrderStatus.equals(OTC_MAIN_STATUS_CANCEL)) {
if (customerOrder.getId() != null) {
baseMapper.deleteById(customerOrder.getId());
}
@@ -924,7 +921,7 @@
} else {
customerOrder.setCoState(CustomerOrderStateStringValues.PARTUNCHECKED);
}
- if (org.apache.commons.lang3.StringUtils.equals("宸蹭笅杈�", otcMainStatus)) {
+ if (org.apache.commons.lang3.StringUtils.equals(OTC_MAIN_STATUS_TRANSMIT, otcMainStatus)) {
customerOrder.setCoState(CustomerOrderStateStringValues.TECHNOLOGYUNCHECK);
customerOrder.setOtcPartSync(Boolean.TRUE);
}
@@ -933,8 +930,8 @@
customerOrder.setCoState(CustomerOrderStateStringValues.TECHNOLOGYUNCHECK);
customerOrder.setOtcPartSync(Boolean.TRUE);
}
- //瀹℃牳鐘舵�佷负 01draft 鑽夌
- customerOrder.setIsAudit(AuditStateStringValues.DRAFT);
+ //瀹℃牳鐘舵�佷负 03accepted 閫氳繃
+ customerOrder.setIsAudit(AuditStateStringValues.ACCEPTED);
baseMapper.insert(customerOrder);
}
addCustomerPara(customerJSONObject, customerOrderJSONObject, customerOrder, orderParamList);
--
Gitblit v1.9.3