tijiao

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

@@ -82,4 +82,7 @@ public interface TmstruckWeightResultMapper extends IBaseMapper<TmstruckWeightRe
 
 //    根据运输订单Id获取计毛实绩
     List<Map<String, Object>> getSporadicSuppliesJiMiaoResult(Map<String, Object> map);
+
+    BigDecimal getXqCgWeightIdByLineAndOrderId(Map<String, Object> map);
+
 }

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

@@ -149,6 +149,7 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
         String substring = orderNumber.substring(0, orderNumber.length() - 1);
         map.putAll(tmstruckEnfactoryResultMapper.selectEnFactoryResultId(substring));
         BigDecimal orderType = DataChange.dataToBigDecimal(map.get("orderTypee"));
+        BigDecimal lineSqe = DataChange.dataToBigDecimal(map.get("segmentSqe"));
         i += updateEnFactoryResultByPDA(map); //添加进厂实绩
         //修改路段顺序号
         i += utilsService.updateOrderLineSequence(map);
@@ -204,6 +205,12 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
                 i += tmstruckMeasureCommissionService.addMaoMeasureCommission(map); //添加计毛委托 并发送计毛委托
                 break;
             case 10: // 采购内转（老区-厂内） 没有进厂
+                if(lineSqe.intValue() == 1){
+                   //计算计皮汽车衡并更新计量实绩
+                    map.put("tarePlace",15);
+                    i += tmstruckWeightResultService.updateWeightResult(map);
+
+                }
                 break;
             case 11:
         }

src/main/resources/bootstrap.yml

@@ -16,45 +16,45 @@ spring:
 #feign设置
 openfeign:
   #正式环境
-#  ColumnDataFeign:
-#    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
-#  BmsShipFeign:
-#    url: ${BMSSHIPFEIGN_URL:172.16.33.166:8078}
-#  BmsTruckFeign:
-#    url: ${BMSTRUCKFEIGN_URL:172.16.33.166:8076}
-#  WmshBoundFeign:
-#    url: ${WMSHBOUNDFEIGN_URL:172.16.33.166:8070}
-#  WMSFeign:
-#    url: ${WMSFEIGN_URL:172.16.33.166:8093}
-#  OmsFeign:
-#    url: ${OMSFEIGN_URL:172.16.33.166:8095}
-#  JoinFeign:
-#    url: ${JOINFEIGN_URL:172.16.33.166:8066}
-#  QmsFeign:
-#    url: ${QMSFEIGN_URL:172.16.33.166:8047}
-#  ImFeign:
-#    url: ${IMFEIGN_URL:172.16.33.161:8055}
-
-
-#    测试环境
   ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.33.162:8001}
+    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   BmsShipFeign:
-    url: ${BMSSHIPFEIGN_URL:172.16.33.162:8007}
+    url: ${BMSSHIPFEIGN_URL:172.16.33.166:8078}
   BmsTruckFeign:
-    url: ${BMSTRUCKFEIGN_URL:172.16.33.162:8009}
+    url: ${BMSTRUCKFEIGN_URL:172.16.33.166:8076}
   WmshBoundFeign:
-    url: ${WMSHBOUNDFEIGN_URL:172.16.33.162:8013}
+    url: ${WMSHBOUNDFEIGN_URL:172.16.33.166:8070}
   WMSFeign:
-    url: ${WMSFEIGN_URL:172.16.33.162:8012}
+    url: ${WMSFEIGN_URL:172.16.33.166:8093}
   OmsFeign:
-    url: ${OMSFEIGN_URL:172.16.33.162:8016}
+    url: ${OMSFEIGN_URL:172.16.33.166:8095}
   JoinFeign:
-    url: ${JOINFEIGN_URL:172.16.33.162:8006}
+    url: ${JOINFEIGN_URL:172.16.33.166:8066}
   QmsFeign:
-    url: ${QMSFEIGN_URL:172.16.33.162:8017}
+    url: ${QMSFEIGN_URL:172.16.33.166:8047}
   ImFeign:
-    url: ${IMFEIGN_URL:172.16.33.162:8018}
+    url: ${IMFEIGN_URL:172.16.33.161:8055}
+
+
+##    测试环境
+#  ColumnDataFeign:
+#    url: ${COLUMNDATAFEIGN_URL:172.16.33.162:8001}
+#  BmsShipFeign:
+#    url: ${BMSSHIPFEIGN_URL:172.16.33.162:8007}
+#  BmsTruckFeign:
+#    url: ${BMSTRUCKFEIGN_URL:172.16.33.162:8009}
+#  WmshBoundFeign:
+#    url: ${WMSHBOUNDFEIGN_URL:172.16.33.162:8013}
+#  WMSFeign:
+#    url: ${WMSFEIGN_URL:172.16.33.162:8012}
+#  OmsFeign:
+#    url: ${OMSFEIGN_URL:172.16.33.162:8016}
+#  JoinFeign:
+#    url: ${JOINFEIGN_URL:172.16.33.162:8006}
+#  QmsFeign:
+#    url: ${QMSFEIGN_URL:172.16.33.162:8017}
+#  ImFeign:
+#    url: ${IMFEIGN_URL:172.16.33.162:8018}
 
 #eureka设置
 eureka:
@@ -124,9 +124,9 @@ mybatis:
 
 server:
   #正式环境
-#  port: 8088
+  port: 8088
   #测试环境
-  port: 8008
+#  port: 8008
 
 
 

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

@@ -656,20 +656,24 @@
 
     <!--  通过运输订单号查找实绩Id -->
     <select id="selectEnFactoryResultId" parameterType="string" resultType="java.util.Map">
-        select TER.RESULT_ID       "resultId",
-               OO.ORDER_ID         "orderId",
-               OO.ORDER_TYPE       "orderTypee", --避免与筛选条件重名
-               TER.RESULT_TOTAL_ID "resultTotalId",
-               RC.CAPACITY_NUMBER   "capacityNumber",
-               TER.SEGMEN_SQE       "segmentSqe" --进厂的路段顺序号
-        from OMSTRUCK_ORDER OO
-                 left join TMSTRUCK_TOTAL_RESULT TTR
-                           on OO.ORDER_ID = TTR.ORDER_ID
-                 left join TMSTRUCK_ENFACTORY_RESULT TER
-                           on TER.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
-                 left join RMS_CAPACITY RC
-                            on RC.CAPACITY_ID = OO.CAPACITY_ID
-        where OO.ORDER_NUMBER = #{orderNumber}
+        select * from (select TER.RESULT_ID              "resultId",
+               OO.ORDER_ID                "orderId",
+               OO.ORDER_TYPE              "orderTypee", --避免与筛选条件重名
+               TER.RESULT_TOTAL_ID        "resultTotalId",
+               RC.CAPACITY_NUMBER         "capacityNumber",
+               TER.SEGMEN_SQE             "segmentSqe", --进厂的路段顺序号
+               ter.result_entry_gate_time
+          from OMSTRUCK_ORDER OO
+          left join TMSTRUCK_TOTAL_RESULT TTR
+            on OO.ORDER_ID = TTR.ORDER_ID
+          left join TMSTRUCK_ENFACTORY_RESULT TER
+            on TER.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+          left join RMS_CAPACITY RC
+            on RC.CAPACITY_ID = OO.CAPACITY_ID
+         where OO.ORDER_NUMBER = #{orderNumber}
+           and ter.result_entry_gate_time is null
+         order by TER.SEGMEN_SQE)
+         where rownum=1
     </select>
 
     <!--  查找排队序号 -->

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

@@ -1379,14 +1379,18 @@
 
     <!--   通过物资Id和运输订单id 查询计量实绩Id -->
     <select id="getWeightIdByMaterialIdAndOrderId" parameterType="java.util.Map" resultType="DECIMAL">
-        select
-        TWR.WEIGHT_TASK_RESULT_ID "weightTaskResultId"
-        from OMSTRUCK_ORDER OO
-        left join TMSTRUCK_TOTAL_RESULT TTR
+        select *
+        from （select TWR.WEIGHT_TASK_RESULT_ID "weightTaskResultId"
+        from omstruck_order oo
+        left join tmstruck_total_result ttr
         on OO.ORDER_ID = TTR.ORDER_ID
         left join TMSTRUCK_WEIGHT_RESULT TWR
         on TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
-        where OO.ORDER_ID = #{orderId}
+        where oo.order_id =  #{orderId}
+        and (twr.result_tare_place_id is null or
+        twr.result_gross_place_id is null)
+        order by twr.tare_segment_sqe)
+        where rownum = 1
         <if test="materialId != null">
             and TWR.MATERIAL_ID = #{materialId}
         </if>