sdja

src/main/java/com/steerinfo/dil/controller/OmstruckOrderMaterialController.java

@@ -75,9 +75,9 @@ public class OmstruckOrderMaterialController extends BaseRESTfulController {
             Map<String, Object> head = (Map<String, Object>) input.get("head");
             head.put("status", "update");
             // 获得金蝶接口配置:正式
-            Map<String, Object> totalMap = easUtil.getTotalMap();
+            //Map<String, Object> totalMap = easUtil.getTotalMap();
 //        // 获得金蝶接口配置:测试
-//        Map<String, Object> totalMap = easDeleteTestUtil.getTotalMap();
+            Map<String, Object> totalMap = easDeleteTestUtil.getTotalMap();
             // 组装报文
             totalMap.put("input", input);
             System.out.println(totalMap);

src/main/java/com/steerinfo/dil/service/impl/OmstruckOrderServiceImpl.java

@@ -582,9 +582,9 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         int result=0;
         BigDecimal orderId =DataChange.dataToBigDecimal(map.get("orderId"));
         Map<String, Object> mesMap = omstruckOrderSeparateMapper.getOrderMesByOrderId(orderId);
-        if(DataChange.dataToBigDecimal(mesMap.get("orderType")).intValue() == 1||DataChange.dataToBigDecimal(mesMap.get("orderType")).intValue() == 4){
-            throw new Exception("钢材订单不允许撤销!");
-        }
+        //if(DataChange.dataToBigDecimal(mesMap.get("orderType")).intValue() == 1||DataChange.dataToBigDecimal(mesMap.get("orderType")).intValue() == 4){
+        //    throw new Exception("钢材订单不允许撤销!");
+        //}
         if(DataChange.dataToBigDecimal(mesMap.get("lineSqe")).intValue() >= 1){
             throw new Exception("撤单失败");
         }

src/main/resources/application-prod.yml

@@ -5,6 +5,7 @@ spring:
     password: Dil123789
     username: dil
     driver-class-name: oracle.jdbc.OracleDriver
+
   application:
     name: DAL-OMS-API-PROD
 

src/main/resources/com/steerinfo/dil/mapper/OmstruckOrderMapper.xml

@@ -4100,10 +4100,14 @@
         TWR.RESULT_NET_WEIGHT        "netWeight",
         TLR.RESULT_LOAD_END_TIME     "loadTime",
         TLFR.RESULT_OUT_GATE_TIME    "outGateTime",
-        TER.RESULT_ENTRY_GATE_TIME   "entryGateTime"
+        TER.RESULT_ENTRY_GATE_TIME   "entryGateTime",
+        ASOM.SALE_ORDER_MATERIAL_ID  "saleOrderMaterialId",
+        ASOM.SALE_ORDER_ID          "saleOrderId"
         FROM OMSTRUCK_ORDER OO
         LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM
         ON OOM.ORDER_ID = OO.ORDER_ID
+        LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
+        ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
         LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
         ON OO.ORDER_ID = TTR.ORDER_ID
         LEFT JOIN TMSTRUCK_ENFACTORY_RESULT TER

src/main/resources/log4j.properties

@@ -1,5 +1,5 @@
 ## LOG4J配置
-log4j.rootCategory=INFO, stdout,file, RUNNING,errorfile
+log4j.rootCategory=INFO,file, RUNNING,errorfile
 ## 控制台输出
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout