tj

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