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 | 81 +++++++++++++++++++++++++++++++++++----- 1 files changed, 70 insertions(+), 11 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 79053cf..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 @@ -2,10 +2,14 @@ import com.jcdm.main.bs.orderScheduling.domain.BsOrderScheduling; import com.jcdm.main.bs.orderScheduling.service.IBsOrderSchedulingService; +import com.jcdm.main.da.passingStationCollection.service.IDaPassingStationCollectionService; +import com.jcdm.main.da.passingStationCollection.service.impl.DaPassingStationCollectionServiceImpl; import com.jcdm.main.webservice.service.ReceivingServices; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import com.jcdm.common.utils.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.List; @@ -17,6 +21,11 @@ @Component("ryTask") public class RyTask { + @Autowired + private DaPassingStationCollectionServiceImpl passingStationCollectionServiceImpl; + @Autowired + private IBsOrderSchedulingService bsOrderSchedulingService; + private static final Logger logger = LoggerFactory.getLogger("sys-user"); public void ryMultipleParams(String s, Boolean b, Long l, Double d, Integer i) { System.out.println(StringUtils.format("鎵ц澶氬弬鏂规硶锛� 瀛楃涓茬被鍨媨}锛屽竷灏旂被鍨媨}锛岄暱鏁村瀷{}锛屾诞鐐瑰瀷{}锛屾暣褰}", s, b, l, d, i)); @@ -29,11 +38,10 @@ public void ryNoParams() { - System.out.println("鎵ц鏃犲弬鏂规硶"); + String a=passingStationCollectionServiceImpl.SelectSN("88","OP010"); + System.out.println("鎵ц杩囩▼杩斿洖锛�" + a); } - @Autowired - private IBsOrderSchedulingService bsOrderSchedulingService; String url = "http://podqapp.cfmoto.com.cn:50100/XISOAPAdapter/MessageServlet?senderParty=&senderService=BC_MES&receiverParty=&receiverService=&interface=SI_ZPP_CF_BC_001_SYN_OUT&interfaceNamespace=http://cfmoto.com/xi/MES"; public void workReportingTasks(){ report10(); @@ -44,13 +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()); + }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); } } } @@ -59,13 +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(), "0790")); - 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.setReport10("1"); + orderScheduling.setReport20("1"); int i = bsOrderSchedulingService.updateBsOrderScheduling(orderScheduling); - System.out.println("鏇存柊鐘舵�佹垚鍔�"); + 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); + } } } } @@ -83,6 +141,7 @@ " </urn:ZPP_BC_001>\n" + " </soapenv:Body>\n" + "</soapenv:Envelope>"; + //logger.info("{}",content); return content; } } -- Gitblit v1.9.3