tijiao

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

@@ -31,8 +31,6 @@ import java.util.*;
 @Service(value = "tmstruckLeaveFactoryResultService")
 public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFactoryResultService {
 
-    @Autowired
-    private ITmstruckLeaveFactoryResultService tmstruckLeaveFactoryResultService;
 
     @Autowired
     private TmstruckLeaveFactoryResultMapper tmstruckLeaveFactoryResultMapper;

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

@@ -599,7 +599,7 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
         }else{
             System.out.println("委托发送失败：" + jsonData);
         }
-        return 1;
+        return 0;
     }
 
 

src/main/resources/application-prod.yml

@@ -43,7 +43,7 @@ openfeign:
   ImFeign:
     url: ${IMFEIGN_URL:172.16.33.166:8055}
   AmsFeign:
-    url: ${AMSFEIGN_URL:172.16.33.166:8079}
+    url: ${AMSFEIGN_URL:localhost:8079}
   OTMSFeign:
     url: ${OTMSFEIGN_URL:172.16.33.166:8038}
 server:

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

@@ -2278,8 +2278,8 @@
                            oo.ORDER_ID "orderId",
                            NVL( r_carrier.carrier_id, 0 ) "carrierIds",
                            NVL( r_cap.capacity_id, 0 ) "capacityIds",
-                           RISWINDEP.INWARD_WAREHOUSE_NAME "transInDep",
-                           RISWOUTDEP.INWARD_WAREHOUSE_NAME "transOutDep",
+                            RDOINDEP.ORG_NAME "transInDep",
+                           RDOOUTDEP.ORG_NAME "transOutDep",
                            RISWINOF.INWARD_WAREHOUSE_NAME "transInWarehouse"
                        FROM
                            AMS_SALE_ORDER ASO
@@ -2296,8 +2296,8 @@
                                LEFT JOIN ams_dispatch_sale_order adso ON adso.sale_order_material_id = asom.sale_order_material_id
                                LEFT JOIN rms_carrier r_carrier ON r_carrier.carrier_id = 3642
                                LEFT JOIN rms_capacity r_cap ON r_cap.capacity_id = oo.capacity_id
-                               LEFT JOIN RMS_INWARD_STEEL_WAREHOUSE RISWINDEP ON RISWINDEP.INWARD_WAREHOUSE_CODE = ASO.TRANSFER_IN_DEP
-                               LEFT JOIN RMS_INWARD_STEEL_WAREHOUSE RISWOUTDEP ON RISWOUTDEP.INWARD_WAREHOUSE_CODE = ASO.TRANSFER_OUT_DEP
+                               LEFT JOIN RMS_DEP_ORG RDOINDEP ON RDOINDEP.ORG_CODE = ASO.TRANSFER_IN_DEP
+                               LEFT JOIN RMS_DEP_ORG RDOOUTDEP ON RDOOUTDEP.ORG_CODE = ASO.TRANSFER_OUT_DEP
                                LEFT JOIN RMS_INWARD_STEEL_WAREHOUSE RISWINOF ON RISWINOF.INWARD_WAREHOUSE_CODE = ASM.TRANSFER_IN_OF_WAREHOUSE
                        WHERE
                            ASO.SALE_TYPE = 4