Merge remote-tracking branch 'origin/master'

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

@@ -116,4 +116,7 @@ public interface TmstruckLeaveFactoryResultMapper extends IBaseMapper<TmstruckLe
 
     //根据运输订单号查询当前物资，判断出厂是否需要装货
     List<String> getMaterial(String orderNumber);
+
+    Integer getCanWorkStatus(BigDecimal orderId);
+
 }

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

@@ -161,7 +161,7 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
         String capacityNumber = (String) mesMap.get("capacityNumber");
         BigDecimal resultTotalId = DataChange.dataToBigDecimal(mesMap.get("totalId"));
         int orderType = DataChange.dataToBigDecimal(mesMap.get("orderType")).intValue();
-        if(orderType == 11){//内转计时调用方法
+        if(orderType == 11 || orderType == 15 || orderType == 16){//内转计时调用方法
             return orderType11Use(map, mesMap, capacityNumber, resultTotalId);
         }
         else if (orderType == 21){//调用计时作业方法

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

@@ -210,7 +210,9 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
                 Double nowNetWeight = tmstruckLeaveFactoryResultMapper.getNowNetWeight(orderNumber);
                 // 得到销售订单下单总重量
                 Double saleWeight = tmstruckLeaveFactoryResultMapper.getSaleMaterialWeight(saleOrderId);
-                if (allNetWeight + nowNetWeight > saleWeight) {
+                //判断当前订单是否可出厂
+                Integer canWork = tmstruckLeaveFactoryResultMapper.getCanWorkStatus(DataChange.dataToBigDecimal(mesMap.get("orderId")));
+                if (allNetWeight + nowNetWeight > saleWeight && canWork == null) {
                     throw new Exception("该销售订单吨位已超额，不允许出厂，请提醒司机走流程卸货！");
                 }
             }

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

@@ -18,10 +18,8 @@ import javax.xml.crypto.Data;
 import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * TmstruckTimeTskResult服务实现：
@@ -60,6 +58,11 @@ public class TmstruckTimeTaskResultServiceImpl implements ITmstruckTimeTaskResul
     private static final String TwoHour="16吨吊车,12吨吊车,35吨吊车,25吨吊车,70吨吊车,80吨吊车,50吨吊车";
 
     private static final String FourHour="220吨吊车,130吨吊车,120吨吊车,150吨吊车,100吨吊车";
+    private static final Set<String> FourHourSet;
+    static {
+        String arr[]={"220吨吊车","130吨吊车","120吨吊车","150吨吊车","100吨吊车"};
+        FourHourSet=Arrays.stream(arr).collect(Collectors.toSet());
+    }
 
     private static final String DxTemp="达兴能源二厂,化工厂";
 
@@ -349,7 +352,7 @@ public class TmstruckTimeTaskResultServiceImpl implements ITmstruckTimeTaskResul
                 }
                 //特殊情况，根据不同计时规则重新计算
                 //4小时规则：100吨以上吊车
-                if (FourHour.contains(capacityTypeName)){
+                if (FourHourSet.contains(capacityTypeName)){
                     if (hour<4&&hour>=0){
                         //1、如实际使用时间不足4小时按照（使用时间+4小时）进行最终结算
                         tmstruckTimeTaskResult.setResultAboutTime(4+hour+"小时"+minutes+"分钟");
@@ -568,7 +571,7 @@ public class TmstruckTimeTaskResultServiceImpl implements ITmstruckTimeTaskResul
                         tmstruckTimeTaskResult1.setResultAboutTime(hour+"小时"+minutes+"分钟");
                     }
                     //如果为100吨以上吊车
-                }else if (FourHour.contains(capacityTypeName)){
+                }else if (FourHourSet.contains(capacityTypeName)){
                     //1、如实际使用时间不足4小时按照（使用时间+4小时）进行最终结算
                     if (hour<0) {
                         tmstruckTimeTaskResult1.setResultAboutTime("4小时");

src/main/java/com/steerinfo/dil/util/Test.java

@@ -0,0 +1,10 @@
+package com.steerinfo.dil.util;
+
+public class Test {
+    public static void main(String[] args) {
+        Integer a = null;
+        if(false || a== null){
+
+        }
+    }
+}

src/main/resources/application-prod.yml

@@ -25,7 +25,7 @@ piction:
 #feign设置
 openfeign:
   ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
+    url: ${COLUMNDATAFEIGN_URL:172.16.33.161:8083}
   BmsShipFeign:
     url: ${BMSSHIPFEIGN_URL:172.16.33.166:8078}
   BmsTruckFeign:

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

@@ -1888,6 +1888,7 @@
        SELECT * FROM (
              SELECT distinct OO.ORDER_ID "orderId",
                     ASO.SALE_ORDER_ID "saleOrderId",
+                    to_char(ASOM.SALE_DATE_OF_RECEIPT-1,'yyyy-mm-dd') "orderTime",
                     ASO.SALE_NUMBER "saleOrderNo",
                     ASM.SALE_MATERIAL_ID "saleMaterialId",
                     ASM.MATERIAL_NUMBER "materialNum",

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

@@ -1243,7 +1243,6 @@
                  LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
                            ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
         WHERE ASOM.SALE_ORDER_ID = #{saleOrderId}
-          AND RM.MATERIAL_NAME = '钒渣'
           AND OO.ORDER_TYPE = 2
           AND TLFR.RESULT_OUT_GATE_TIME IS NOT NULL
     </select>
@@ -1355,4 +1354,8 @@
            LEFT JOIN RMS_MATERIAL_CHECKLOAD RMC ON RM.MATERIAL_NAME LIKE '%' || RMC.MATERIAL_NAME ||'%'
         WHERE ORDER_TYPE=13 AND ORDER_STATUS=5 AND RMC.MATERIAL_NAME IS NOT NULL AND OO.ORDER_NUMBER=#{orderNumber}
     </select>
+    <select id="getCanWorkStatus" resultType="java.lang.Integer" parameterType="decimal">
+        SELECT OO.CAN_WORK FROM OMSTRUCK_ORDER OO
+        WHERE OO.ORDER_ID = #{orderId}
+    </select>
 </mapper>