From 5030f3d30ccc1bd16db371c6970a48103aff9191 Mon Sep 17 00:00:00 2001
From: yyt <306727702@qq.com>
Date: 星期一, 03 六月 2024 13:56:57 +0800
Subject: [PATCH] 380新产品,优化
---
jcdm-quartz/src/main/java/com/jcdm/quartz/task/RyTask.java | 66 ++++++++++++++++++++++++++++----
1 files changed, 57 insertions(+), 9 deletions(-)
diff --git a/jcdm-quartz/src/main/java/com/jcdm/quartz/task/RyTask.java b/jcdm-quartz/src/main/java/com/jcdm/quartz/task/RyTask.java
index 6a15961..c9f410a 100644
--- a/jcdm-quartz/src/main/java/com/jcdm/quartz/task/RyTask.java
+++ b/jcdm-quartz/src/main/java/com/jcdm/quartz/task/RyTask.java
@@ -52,14 +52,38 @@
BsOrderScheduling bsOrderScheduling = new BsOrderScheduling();
bsOrderScheduling.setReport10("0");
List<BsOrderScheduling> bsOrderSchedulings = bsOrderSchedulingService.selectBsOrderSchedulingList(bsOrderScheduling);
+ String status="";
+ String ev_meassage="";
for (BsOrderScheduling orderScheduling : bsOrderSchedulings) {
- String xmlResult = ReceivingServices.getInterfaceInformationXml(url, getProductionPlanInformationXml(orderScheduling.getOrderNo(), "0010"));
- String status = ReceivingServices.xmlToJSON3(xmlResult);
- if(status.equals("1")){
+ try {
+ String xmlResult = ReceivingServices.getInterfaceInformationXml(url, getProductionPlanInformationXml(orderScheduling.getOrderNo(), "0010"));
+ ev_meassage=ReceivingServices.xmlToJSON1(xmlResult);
+ status = ReceivingServices.xmlToJSON3(xmlResult);
+ } catch (Exception e) {
+ status="3";
+ }
+ if(status.equals("1")) {
orderScheduling.setReport10("1");
int i = bsOrderSchedulingService.updateBsOrderScheduling(orderScheduling);
- System.out.println("鏇存柊鐘舵�佹垚鍔�");
- //logger.info("{}鍚堢鎶ュ伐鎴愬姛",orderScheduling.getOrderNo());
+ logger.info("{}鍚堢鎶ュ伐鎴愬姛",orderScheduling.getOrderNo());
+ }else {
+ if(StringUtils.isEmpty(orderScheduling.getSpareField1())){
+ orderScheduling.setSpareField1("1");
+ bsOrderSchedulingService.updateBsOrderScheduling(orderScheduling);
+ }else{
+ if(Integer.valueOf(orderScheduling.getSpareField1())+1>=3) {
+ //绱鎶ュ伐寮傚父瓒呰繃3娆�
+ orderScheduling.setReport10("3");
+ orderScheduling.setSpareField1(String.valueOf(Integer.valueOf(orderScheduling.getSpareField1()) + 1));
+ }else {
+ orderScheduling.setSpareField1(String.valueOf(Integer.valueOf(orderScheduling.getSpareField1()) + 1));
+ }
+ bsOrderSchedulingService.updateBsOrderScheduling(orderScheduling);
+ }
+ if(status.equals("3"))
+ logger.info("{}鍚堢鎶ュ伐鍥犱负缃戠粶鍘熷洜锛屾姤宸ュけ璐ワ紒",orderScheduling.getOrderNo());
+ else
+ logger.info("{}鍚堢鎶ュ伐澶辫触,鍘熷洜锛歿}",orderScheduling.getOrderNo(),ev_meassage);
}
}
}
@@ -68,14 +92,38 @@
BsOrderScheduling bsOrderScheduling = new BsOrderScheduling();
bsOrderScheduling.setReport20("0");
List<BsOrderScheduling> bsOrderSchedulings = bsOrderSchedulingService.selectBsOrderSchedulingList(bsOrderScheduling);
+ String status="";
+ String ev_meassage="";
for (BsOrderScheduling orderScheduling : bsOrderSchedulings) {
- String xmlResult = ReceivingServices.getInterfaceInformationXml(url, getProductionPlanInformationXml(orderScheduling.getOrderNo(), "0020"));
- String status = ReceivingServices.xmlToJSON3(xmlResult);
+ try {
+ String xmlResult = ReceivingServices.getInterfaceInformationXml(url, getProductionPlanInformationXml(orderScheduling.getOrderNo(), "0020"));
+ ev_meassage=ReceivingServices.xmlToJSON1(xmlResult);
+ status = ReceivingServices.xmlToJSON3(xmlResult);
+ } catch (Exception e) {
+ status="3";
+ }
if(status.equals("1")){
orderScheduling.setReport20("1");
int i = bsOrderSchedulingService.updateBsOrderScheduling(orderScheduling);
- System.out.println("鏇存柊鐘舵�佹垚鍔�");
- //logger.info("{}鎬昏鎶ュ伐鎴愬姛",orderScheduling.getOrderNo());
+ logger.info("{}鎬昏鎶ュ伐鎴愬姛",orderScheduling.getOrderNo());
+ }else {
+ if(StringUtils.isEmpty(orderScheduling.getSpareField2())){
+ orderScheduling.setSpareField2("1");
+ bsOrderSchedulingService.updateBsOrderScheduling(orderScheduling);
+ }else{
+ if(Integer.valueOf(orderScheduling.getSpareField2())+1>=3) {
+ //绱鎶ュ伐寮傚父瓒呰繃3娆�
+ orderScheduling.setReport20("3");
+ orderScheduling.setSpareField2(String.valueOf(Integer.valueOf(orderScheduling.getSpareField2()) + 1));
+ }else{
+ orderScheduling.setSpareField2(String.valueOf(Integer.valueOf(orderScheduling.getSpareField2()) + 1));
+ }
+ bsOrderSchedulingService.updateBsOrderScheduling(orderScheduling);
+ if(status.equals("3"))
+ logger.info("{}鎬昏鎶ュ伐鍥犱负缃戠粶鍘熷洜锛屾姤宸ュけ璐ワ紒",orderScheduling.getOrderNo());
+ else
+ logger.info("{}鎬昏鎶ュ伐澶辫触,鍘熷洜锛歿}",orderScheduling.getOrderNo(),ev_meassage);
+ }
}
}
}
--
Gitblit v1.9.3