Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU2/DAI_DAZHOU-OMS

src/main/java/com/steerinfo/dil/controller/OmstruckOrderController.java

@@ -1281,4 +1281,17 @@ public class OmstruckOrderController extends BaseRESTfulController {
         PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null, diverInfoForSaleorder);
         return success(pageList);
     }
+
+    @ApiOperation(value = "通过运单id或者运单号查询车辆是否放行")
+    @PostMapping("/canCapacityEnfactory")
+    public RESTfulResult canCapacityEnfactory(@RequestBody Map<String,Object> mapValue) {
+        String result = omstruckOrderMapper.canCapacityEnfactory(mapValue);
+        Integer orderType = (Integer) mapValue.get("orderType");
+        if (orderType != 1) {
+            return success("OK");
+        }
+        else {
+            return success(result);
+        }
+    }
 }

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

@@ -342,4 +342,7 @@ public interface OmstruckOrderMapper extends IBaseMapper<OmstruckOrder, BigDecim
     //销售：接收运输订单展示pc端界面
     List<Map<String, Object>> getDriverInfoForSale2(Map<String, Object> map);
     List<Map<String, Object>> getTransportOrder(Map<String, Object> mapValue);
+
+    // 通过运单id或者运单号查询车辆是否放行
+    String canCapacityEnfactory(Map<String, Object> mapValue);
 }

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

@@ -3975,5 +3975,22 @@
         where  OO.ORDER_ID=#{orderId} and OO.ORDER_STATUS = #{orderStatus}
     </select>
 
+    <select id="canCapacityEnfactory" parameterType="java.util.Map" resultType="java.lang.String">
+        SELECT
+        TER.INSERT_UPDATE_REMARK AS "isOk"
+        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
+        <where>
+            <if test="orderId != null">
+                AND OO.ORDER_ID = #{orderId}
+            </if>
+            <if test="orderNumber != null">
+                AND OO.ORDER_NUMBER = #{orderNumber}
+            </if>
+        </where>
+    </select>
 
 </mapper>