Merge remote-tracking branch 'origin/master'

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

@@ -90,4 +90,6 @@ public interface TmstruckEnfactoryResultMapper extends IBaseMapper<TmstruckEnfac
 
     Integer getSaleOrderStatus(BigDecimal orderId);
 
+    Map<String, Object> selectEnFactoryResultIdSteel(BigDecimal resultTotalId);
+
 }

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

@@ -175,14 +175,19 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
             }
         }
         Map<String, Object> selectMap = tmstruckEnfactoryResultMapper.selectEnFactoryResultId(resultTotalId);
+        if(orderType == 1) {
+            selectMap = tmstruckEnfactoryResultMapper.selectEnFactoryResultIdSteel(resultTotalId);
+        }
         if(selectMap == null){
             throw new Exception("该车已进厂！！");
         }else{
-            BigDecimal segmentSqe = DataChange.dataToBigDecimal(selectMap.get("segmentSqe"));
-            BigDecimal orderSegmentSqe = DataChange.dataToBigDecimal(mesMap.get("orderSegmentSqe"));
-            //如果当前路段顺序号 +1 不等于进厂路段顺序号 则不允许进厂 （针对同一路线多次进厂情况）
-            if(segmentSqe.intValue() != (orderSegmentSqe.intValue() + 1)){
-                throw  new Exception("作业环节未到进厂！");
+            if(orderType != 1) {
+                BigDecimal segmentSqe = DataChange.dataToBigDecimal(selectMap.get("segmentSqe"));
+                BigDecimal orderSegmentSqe = DataChange.dataToBigDecimal(mesMap.get("orderSegmentSqe"));
+                //如果当前路段顺序号 +1 不等于进厂路段顺序号 则不允许进厂 （针对同一路线多次进厂情况）
+                if(segmentSqe.intValue() != (orderSegmentSqe.intValue() + 1)){
+                    throw  new Exception("作业环节未到进厂！");
+                }
             }
         }
         map.putAll(mesMap);

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

@@ -177,7 +177,6 @@ public class UtilsServiceImpl implements IUtilsService {
      */
     @Override
     public void pushMesToWebsocket(String capacityNumber, String pushMes) {
-
         //添加消息实体
         HashMap<Object, Object> mesMap = new HashMap<>();
         mesMap.put("messageType", 4); //用于进厂后 刷新消息

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

@@ -2276,26 +2276,12 @@
             ELSE TO_CHAR(ACTP2.PRICE_VALUE,'9999999990.99')
         END) AS "priceValue",
         TO_CHAR(BDO.DETAILS_AMOUNT,'9999999990.99') "detailsAmount",
-        case
-        when nvl(ASOM.HISTORY_SHIPPING_ADDRESS_ID,0) !=0
-        then (select RRA.ADDRESS_PROVINCE||RRA.ADDRESS_DISTRICT||RRA.ADDRESS_TOWN
-        ||RRP.ADDRESS_DELIVERY_ADDRESS "realAddress"
-        from RMS_RECEIVE_PLACE RRP
-        LEFT JOIN RMS_RECEIVE_ADDRESS RRA
-        ON RRA.ADDRESS_ID=RRP.ADDRESS_ID
-        WHERE RRP.PLACE_ID=ASOM.HISTORY_SHIPPING_ADDRESS_ID)
-        when nvl(ASOM.HISTORY_SHIPPING_ADDRESS_ID,0) =0
-        then
         RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT ||
         RRA.ADDRESS_TOWN || RRP.ADDRESS_DELIVERY_ADDRESS
-        end  "addressPlace",
+          "addressPlace",
         --卸货城市
-        case
-        when nvl(ASOM.HISTORY_SHIPPING_ADDRESS_ID,0)=0
-        THEN NULL
-        WHEN NVL(ASOM.HISTORY_SHIPPING_ADDRESS_ID,0)!=0
-        THEN RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT ||
-        RRA.ADDRESS_TOWN|| RRP.ADDRESS_DELIVERY_ADDRESS end "actualAddress",
+        RRA3.ADDRESS_PROVINCE || RRA3.ADDRESS_DISTRICT ||
+        RRA3.ADDRESS_TOWN|| RRP3.ADDRESS_DELIVERY_ADDRESS "actualAddress",
         RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT ||
         RRA.ADDRESS_TOWN AS "actualCity",
         RRP.PLACE_ID "placeId",
@@ -2358,6 +2344,10 @@
         ON RRP.PLACE_ID = ASOM.SALE_SHIPPING_ADDRESS_ID
         LEFT JOIN RMS_RECEIVE_ADDRESS RRA
         ON RRA.ADDRESS_ID = RRP.ADDRESS_ID
+        LEFT JOIN RMS_RECEIVE_PLACE RRP3
+        ON ASOM.ACTUALLY_ADDRESS_ID = RRP3.PLACE_ID
+        LEFT JOIN RMS_RECEIVE_ADDRESS RRA3
+        ON RRA3.ADDRESS_ID = RRP3.ADDRESS_ID
         LEFT JOIN AMS_DISPATCH_SALE_ORDER ADSO
         ON ADSO.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
         LEFT JOIN RMS_CARRIER R_CARRIER
@@ -2561,26 +2551,12 @@
         OO.ORDER_NUMBER "orderNo",
         TO_CHAR(ACTP.PRICE_VALUE,'9999999990.99') AS "priceValue",
         TO_CHAR(BDO.DETAILS_AMOUNT,'9999999990.99') "detailsAmount",
-        case
-        when nvl(ASOM.HISTORY_SHIPPING_ADDRESS_ID,0) !=0
-        then (select RRA.ADDRESS_PROVINCE||RRA.ADDRESS_DISTRICT||RRA.ADDRESS_TOWN
-        ||RRP.ADDRESS_DELIVERY_ADDRESS "realAddress"
-        from RMS_RECEIVE_PLACE RRP
-        LEFT JOIN RMS_RECEIVE_ADDRESS RRA
-        ON RRA.ADDRESS_ID=RRP.ADDRESS_ID
-        WHERE RRP.PLACE_ID=ASOM.HISTORY_SHIPPING_ADDRESS_ID)
-        when nvl(ASOM.HISTORY_SHIPPING_ADDRESS_ID,0) =0
-        then
         RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT ||
         RRA.ADDRESS_TOWN || RRP.ADDRESS_DELIVERY_ADDRESS
-        end  "addressPlace",
+        "addressPlace",
         --卸货城市
-        case
-        when nvl(ASOM.HISTORY_SHIPPING_ADDRESS_ID,0)=0
-        THEN NULL
-        WHEN NVL(ASOM.HISTORY_SHIPPING_ADDRESS_ID,0)!=0
-        THEN RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT ||
-        RRA.ADDRESS_TOWN|| RRP.ADDRESS_DELIVERY_ADDRESS end "actualAddress",
+        RRA3.ADDRESS_PROVINCE || RRA3.ADDRESS_DISTRICT ||
+        RRA3.ADDRESS_TOWN|| RRP3.ADDRESS_DELIVERY_ADDRESS  "actualAddress",
         RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT ||
         RRA.ADDRESS_TOWN AS "actualCity",
         RRP.PLACE_ID "placeId",
@@ -2643,6 +2619,10 @@
         ON RRP.PLACE_ID = ASOM.SALE_SHIPPING_ADDRESS_ID
         LEFT JOIN RMS_RECEIVE_ADDRESS RRA
         ON RRA.ADDRESS_ID = RRP.ADDRESS_ID
+        LEFT JOIN RMS_RECEIVE_PLACE RRP3
+        ON ASOM.ACTUALLY_ADDRESS_ID = RRP3.PLACE_ID
+        LEFT JOIN RMS_RECEIVE_ADDRESS RRA3
+        ON RRA3.ADDRESS_ID = RRP3.ADDRESS_ID
         LEFT JOIN AMS_DISPATCH_SALE_ORDER ADSO
         ON ADSO.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
         LEFT JOIN RMS_CARRIER R_CARRIER

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

@@ -1551,5 +1551,16 @@
           --and oo.ORDER_STATUS = 5
           --and oo.ORDER_PRINT_STATUS is null
     </select>
+    <select id="selectEnFactoryResultIdSteel" resultType="java.util.Map" parameterType="java.math.BigDecimal">
+        select *
+        from (select TER.RESULT_ID       "resultId",
+                     TER.SEGMEN_SQE      "segmentSqe", --进厂的路段顺序号
+                     TER.RESULT_ENTRY_GATE_TIME,
+                     TER.INSERT_UPDATE_REMARK   "insertUpdateRemark"
+              from TMSTRUCK_ENFACTORY_RESULT TER
+              where TER.RESULT_TOTAL_ID = #{resultTotalId}
+              order by TER.SEGMEN_SQE)
+        where rownum = 1
+    </select>
 
 </mapper>