修改零星

src/main/java/com/steerinfo/dil/mapper/TmstruckUnloadResultMapper.java

@@ -41,7 +41,8 @@ public interface TmstruckUnloadResultMapper extends IBaseMapper<TmstruckUnloadRe
 
     //通过总实绩ID查询卸货点
     BigDecimal getUnloadPointId(Map<String, Object> map);
-//    通过运输订单id查询卸车实绩
+
+    // 通过运输订单id查询卸车实绩(零星物资）
     List<Map<String, Object>> getSporadicSuppliesUnloadResult(Map<String, Object> map);
 
     //根据运输订单号查询物资id优先级

src/main/java/com/steerinfo/dil/mapper/TmstruckWeightResultMapper.java

@@ -71,13 +71,13 @@ public interface TmstruckWeightResultMapper extends IBaseMapper<TmstruckWeightRe
     //通过运输订单id获取路段顺序号、物资类型、计量实绩主键、line_id
     Map<String, BigDecimal> selectByOrderId(BigDecimal orderId);
 
-    //零星物资根据运输订单Id获取计毛实绩
-    List<Map<String, Object>> getFactorySkinSporadicJiMiao(Map<String, Object> map);
+//    //零星物资根据运输订单Id获取计毛实绩
+//    List<Map<String, Object>> getFactorySkinSporadicJiMiao(Map<String, Object> map);
 
     //零星物资根据运输订单Id获取计皮实绩
     List<Map<String, Object>> getFactorySkinSporadicJIPi(Map<String, Object> map);
 
-    List<Map<String,Object>> getFactorySporadicJiMiaoResult(Map<String,Object> map);
+//    List<Map<String,Object>> getFactorySporadicJiMiaoResult(Map<String,Object> map);
 
     //根据运输订单Id获取计皮实绩
     List<Map<String, Object>> getSporadicSuppliesJiPiResult(Map<String, Object> map);
@@ -85,7 +85,7 @@ public interface TmstruckWeightResultMapper extends IBaseMapper<TmstruckWeightRe
     //根据运输订单id获取计量实绩
     List<Map<String,Object>> getFactorySkinSporadicWeight(Map<String,Object> map);
 
-     //根据运输订单Id获取计毛实绩
+     //零星物流根据运输订单Id获取计毛实绩
     List<Map<String, Object>> getSporadicSuppliesJiMiaoResult(Map<String, Object> map);
 
 //    BigDecimal getXqCgWeightIdByLineAndOrderId(Map<String, Object> map);

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

@@ -96,12 +96,11 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
             case 11:
                 return tmstruckWeightResultMapper.getInFactoryJiLiangResult(map);       //apiId: 358
             case 12:
-                return tmstruckWeightResultMapper.getSporadicSuppliesJiMiaoResult(map);//apiId:405
             case 13:
-                return tmstruckWeightResultMapper.getFactorySkinSporadicJiMiao(map);//apiId:422
             case 15:
             case 16:
-                 return tmstruckWeightResultMapper.getFactorySporadicJiMiaoResult(map);//apiId:422
+                return tmstruckWeightResultMapper.getSporadicSuppliesJiMiaoResult(map); //apiId:405
+
         }
         return null;
     }

src/main/resources/application-dev.yml

@@ -31,7 +31,7 @@ openfeign:
   WMSFeign:
     url: ${WMSFEIGN_URL:172.16.33.162:8012}
   OmsFeign:
-    url: ${OMSFEIGN_URL:172.16.33.162:8016}
+    url: ${OMSFEIGN_URL:192.168.1.113:8016}
   JoinFeign:
     url: ${JOINFEIGN_URL:172.16.33.162:8006}
   QmsFeign:

src/main/resources/bootstrap.yml

@@ -1,7 +1,7 @@
 api.version: api/v1/truckTms
 spring:
   profiles:
-    include: ${SPRING_PROFILES:prod}
+    include: ${SPRING_PROFILES:dev}
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8

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

@@ -1170,11 +1170,14 @@
                 TER.RESULT_ENTRY_GATE_TIME "resultEntryGateTime",
                 RM.MATERIAL_NAME "materialName",
                 OOM.ORDER_MATERIAL_NUMBER "materialNumber",
-                OOM.ORDER_MATERIAL_WEIGHT "materialWeight"
+                OOM.ORDER_MATERIAL_WEIGHT "materialWeight",
+                TWR.RESULT_NET_WEIGHT "netWeight"
 
         from TMSTRUCK_ENFACTORY_RESULT TER
         left join TMSTRUCK_TOTAL_RESULT TTR
         on TER.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        left join TMSTRUCK_WEIGHT_RESULT TWR
+        on TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
         left join OMSTRUCK_ORDER OO
         on TTR.ORDER_ID = OO.ORDER_ID
         left join OMSTRUCK_ORDER_MATERIAL OOM
@@ -1183,6 +1186,8 @@
         ON RM.MATERIAL_ID=OOM.MATERIAL_ID
         left join AMSTRUCK_SPORADIC_ORDER ASO
         on OO.ORDER_PLAN_ID = ASO.SPORADIC_ORDER_ID
+        left join AMSTRUCK_SPORADIC_MATERIAL ASM
+        on ASM.SPORADIC_ORDER_ID=ASO.SPORADIC_ORDER_ID
         left join RMS_GATEPOST RG
         on RG.GATEPOST_ID = TER.GATEPOST_ID
         left join RMS_CAPACITY RC

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

@@ -1070,7 +1070,7 @@
             and twr.MATERIAL_ID = oom.MATERIAL_ID
         where oo.order_number = #{orderNumber}
     </select>
-    <!--零星物资 -->
+    <!--零星物资出厂实绩列表 -->
     <select id="getSporadicLeaveFactory" parameterType="java.util.Map" resultType="java.util.Map">
         select *
         from (
@@ -1083,10 +1083,13 @@
         TLFR.RESULT_TRUCK_SNAPSHOT_PICTURE "resultTruckSnapshotPicture",
         RM.MATERIAL_NAME                    "materialName",
         OOM.ORDER_MATERIAL_WEIGHT           "materialWeight",
-        OOM.ORDER_MATERIAL_NUMBER            "materialNumber"
+        OOM.ORDER_MATERIAL_NUMBER           "materialNumber",
+        TWR.RESULT_NET_WEIGHT                "netWeight"
         from TMSTRUCK_LEAVE_FACTORY_RESULT TLFR
         left join TMSTRUCK_TOTAL_RESULT TTR
         on TTR.RESULT_TOTAL_ID = TLFR.RESULT_TOTAL_ID
+        left join TMSTRUCK_WEIGHT_RESULT TWR
+        on TWR.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
         left join OMSTRUCK_ORDER OO
         on OO.ORDER_ID = TTR.ORDER_ID
         left join OMSTRUCK_ORDER_MATERIAL OOM

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

@@ -1492,10 +1492,13 @@
         TLR.INSERT_TIME "insertTime",
         RM.MATERIAL_NAME "materialName",
         OOM.ORDER_MATERIAL_NUMBER "materialNumber",
-        OOM.ORDER_MATERIAL_WEIGHT "materialWeight"
+        OOM.ORDER_MATERIAL_WEIGHT "materialWeight",
+        TWR.RESULT_NET_WEIGHT "netWeight"
         from TMSTRUCK_LOAD_RESULT TLR
         left join TMSTRUCK_TOTAL_RESULT TTR
         on TLR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        left join TMSTRUCK_WEIGHT_RESULT TWR
+        on TWR.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
         left join OMSTRUCK_ORDER OO
         on TTR.ORDER_ID = OO.ORDER_ID
         left join OMSTRUCK_ORDER_MATERIAL OOM

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

@@ -923,11 +923,14 @@
         RW.WAREHOUSE_NAME         "warehouseName",
         RM.MATERIAL_NAME          "materialName",
         OOM.ORDER_MATERIAL_WEIGHT  "materialWeight",
-        OOM.ORDER_MATERIAL_NUMBER  "materialNumber"
+        OOM.ORDER_MATERIAL_NUMBER  "materialNumber",
+        TWR.RESULT_NET_WEIGHT       "orderMaterialNetWeight"
 
         FROM TMSTRUCK_UNLOAD_RESULT TUR
         LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
         ON TTR.RESULT_TOTAL_ID = TUR.RESULT_TOTAL_ID
+        LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
+        ON TWR.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
         LEFT JOIN OMSTRUCK_ORDER OO
         ON OO.ORDER_ID = TTR.ORDER_ID
         LEFT JOIN  OMSTRUCK_ORDER_MATERIAL OOM

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

@@ -2194,6 +2194,7 @@
         RTC.TRUCK_CALCULATE_NUMBER "truckCalculateNumber",
         TWR.RESULT_GROSS_WEIGHT "resultGrossWeight",
         TWR.RESULT_GROSS_WEIGHT_TIME "resultGrossWeightTime",
+        TWR.RESULT_NET_WEIGHT "netWeight",
         RM.MATERIAL_NAME "materialName",
         OO.ORDER_ID "orderId",
         OO.ORDER_STATUS "orderStatus"
@@ -2214,7 +2215,7 @@
         left join RMS_TRUCK_CALCULATE RTC
         on RTC.TRUCK_CALCULATE_ID = TWR.RESULT_GROSS_PLACE_ID
         where RESULT_GROSS_WEIGHT_TIME is not null and
-        OO.ORDER_TYPE = 12
+        OO.ORDER_TYPE in (12,13,15,16)
         )
         <where>
             <if test="purchaseOrderNo != null">