From b4ff0d321d1ffb3e348432b89895441494d40564 Mon Sep 17 00:00:00 2001
From: wujian <14790700720@163.com>
Date: 星期二, 06 八月 2024 14:27:58 +0800
Subject: [PATCH] fix7-新增LOG
---
jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/controller/BsOrderSchedulingController.java | 3 +++
jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java | 1 +
jcdm-main/src/main/java/com/jcdm/main/webservice/service/ReceivingServices.java | 17 +++++++++++++++++
3 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/controller/BsOrderSchedulingController.java b/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/controller/BsOrderSchedulingController.java
index d3b46b7..f02b52a 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/controller/BsOrderSchedulingController.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/controller/BsOrderSchedulingController.java
@@ -328,6 +328,9 @@
if (StringUtils.isEmpty(engineNo)){
return R.fail(500,"绠变綋鐮佷笉鑳戒负绌猴紝璇烽噸璇�");
}
+ if (!engineNo.contains(",")){
+ return R.fail(500,"绠变綋鐮佹牸寮忔湁璇紝璇烽噸璇�");
+ }
ProductNewPassStation checkStation = new ProductNewPassStation();
checkStation.setBoxCode(engineNo);
List<ProductNewPassStation> checkList = productNewPassStationService.getProductPassStationList(checkStation);
diff --git a/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java b/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java
index f63d690..a910f2f 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java
@@ -207,6 +207,7 @@
List<OmProductionOrdeInfo> omProductionOrdeInfos = omProductionOrdeInfoService.selectOmProductionOrdeInfoList(omProductionOrdeInfo);
if(omProductionOrdeInfos.size() == 0){
try {
+ logger.info("鎺ユ敹宸ュ崟鍙凤細,{}",productionNotice);
ReceivingServices.insertWebserviceData(factory,productionNotice);
} catch (Exception e) {
return error("鎺ユ敹澶辫触锛佽妫�鏌ラ�氱煡鍗曞彿");
diff --git a/jcdm-main/src/main/java/com/jcdm/main/webservice/service/ReceivingServices.java b/jcdm-main/src/main/java/com/jcdm/main/webservice/service/ReceivingServices.java
index e286019..481058a 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/webservice/service/ReceivingServices.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/webservice/service/ReceivingServices.java
@@ -25,6 +25,8 @@
import org.apache.commons.httpclient.methods.StringRequestEntity;
import org.apache.commons.io.IOUtils;
import com.jcdm.main.om.productionOrde.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RestController;
@@ -35,6 +37,8 @@
import java.util.List;
public class ReceivingServices {
+
+ private static final Logger logger = LoggerFactory.getLogger("sys-user");
@Autowired
// private static IOmProductionOrdeInfoService omProductionOrdeInfoService;
private static IOmProductionOrdeInfoService omProductionOrdeInfoService = BeanUtils.getBean(IOmProductionOrdeInfoService.class);
@@ -110,18 +114,25 @@
public static void insertWebserviceData(String factory,String str) {
String result = getInterfaceInformationXml(ProductionPlanInformationUrl, getProductionPlanInformationXml(factory,str));
+ logger.info("messageLocation1,"+result);
String jsonStr = xmlToJSON2(result);
+ logger.info("messageLocation5,"+jsonStr);
if (StrUtil.isNotBlank(jsonStr)){
if (!jsonStr.contains("[") && !jsonStr.contains("]")){
StringBuilder stringBuilder = new StringBuilder(jsonStr);
stringBuilder.insert(8,"[");
stringBuilder.insert(jsonStr.length(),"]");
jsonStr = stringBuilder.toString();
+ logger.info("messageLocation6,"+jsonStr);
}
Gson gson = new Gson();
// 灏唈son瀛楃涓茶浆鎹㈡垚瀵硅薄
ItemList itemList = gson.fromJson(jsonStr, ItemList.class);
+ if (ObjectUtil.isNotNull(itemList)){
+ logger.info("messageLocation7,"+ itemList);
+ }
for (Item item : itemList.getItem()) {
+ logger.info("messageLocation8,"+item);
OmProductionOrdeInfo ordeInfo = new OmProductionOrdeInfo();
ordeInfo.setWorkshopCode(item.getWERKS());
ordeInfo.setProductCode(item.getPLNBEZ());
@@ -172,6 +183,7 @@
try {
status = client.executeMethod(postMethod);
} catch (IOException e) {
+ logger.info("errorLocation1,"+e);
throw new RuntimeException(e);
}
if (status == 200) {// 鎴愬姛
@@ -179,6 +191,7 @@
try {
is = postMethod.getResponseBodyAsStream();
} catch (IOException e) {
+ logger.info("errorLocation2,"+e);
throw new RuntimeException(e);
}
// 鑾峰彇璇锋眰缁撴灉瀛楃涓�
@@ -187,6 +200,7 @@
result = IOUtils.toString(is);
return result;
} catch (IOException e) {
+ logger.info("errorLocation3,"+e);
throw new RuntimeException(e);
}
}
@@ -224,14 +238,17 @@
.getAsJsonObject("SOAP:Body")
.getAsJsonObject("n0:ZPP_CF_MES_005.Response");
if (ObjectUtil.isNotNull(result)){
+ logger.info("messageLocation2,"+result);
String string = result.get("EV_MESSAGE").toString();
if (string.contains("鏌ヨ鎴愬姛")){
+ logger.info("messageLocation3,"+string);
JsonObject etData = jsonObject2
.getAsJsonObject("SOAP:Envelope")
.getAsJsonObject("SOAP:Body")
.getAsJsonObject("n0:ZPP_CF_MES_005.Response")
.getAsJsonObject("ET_DATA");
data = etData.toString();
+ logger.info("messageLocation4,"+data);
}
}
--
Gitblit v1.9.3