Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU2/DAI_DAZHOU-OMS

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

@@ -63,9 +63,9 @@ public class OmstrainOrderServiceImpl implements IOmstrainOrderService {
 
     private  String guoYuanUrl="http://113.204.217.110:9810/dagang/receiving";
     //城嘉库登录访问接口
-    private  String chengJiaLoginUrl="http://122.112.226.137:8083/dagon/login";
+    private  String chengJiaLoginUrl="http://116.204.73.104:8083/dagon/login";
     //城嘉库推送数据接口
-    private  String chengJiaSendUrl="http://122.112.226.137:8083/dagon/selectSaleSteelOrder";
+    private  String chengJiaSendUrl="http://116.204.73.104:8083/dagon/selectSaleSteelOrder";
 
     @Bean
     @LoadBalanced

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

@@ -584,7 +584,9 @@
                                    RAR1.RAILWAY_BUREAU                              "railwayBureau",
                                    OTO.STRAWMATS                                    "strawMats",
                                    OO.ORDER_NUMBER                                  "number",
-                                   OTO.WAREHOUSE_ID                                 "unloadPointId"
+                                   OTO.WAREHOUSE_ID                                 "unloadPointId",
+                                   decode(OTO."IS_ACCEPT",0,'未收货',1,'已收货')      "isAccept",
+                                   OTO.is_accept_time                               "isAcceptTime"
                    FROM AMS_SALE_ORDER ASO
                           LEFT JOIN RMS_CONSIGNEE RC ON RC.CONSIGNEE_ID = ASO.RECEIVE_ID
                           LEFT JOIN RMS_SHIPPER RS ON RS.SHIPPER_ID = ASO.SHIPPER_ID

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

@@ -731,7 +731,10 @@
                 LEFT JOIN RMS_UNIT_OF_MEASURE RUOM ON TTTR.RESULT_UOM_ID = RUOM.UNIT_OF_MEASURE_ID
         WHERE
                 TTTR.RESULT_VALUE IS NOT NULL and TTTR.RESULT_TIME_TYPE = 3 and TTTR.INSERT_USERNAME =#{userId}
-        <if test="orderType!=null">
+        <if test="orderType!=null and orderType==21">
+            AND OO.ORDER_TYPE IN (21,11)
+        </if>
+        <if test="orderType!=null and orderType!=21">
             AND OO.ORDER_TYPE=#{orderType}
         </if>
         <include refid="orderBy">

src/main/resources/log4j.properties

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