修改采购进厂qms

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

@@ -45,8 +45,7 @@ public class QmsQueueListController extends BaseRESTfulController {
     })
     @PostMapping("/addQueueList")
     public RESTfulResult addQueueList(@RequestBody(required = false) Map<String, Object> mapValue){
-        String orderNumber = (String) mapValue.get("orderNumber");
-        int i = qmsQueueListService.addQueueList(orderNumber);
+        int i = qmsQueueListService.addQueueList(mapValue);
         return success(i);
     }
 

src/main/java/com/steerinfo/dil/feign/TmsTruckFeign.java

@@ -18,8 +18,8 @@ import java.util.Map;
 @FeignClient(value = "dil-tms-truck-dev",url = "${openfeign.TmsTruckFeign.url}")
 public interface TmsTruckFeign {
 
-    @PostMapping("api/v1/truckTms/tmstruckenfactoryresults/updateEnactoryResult")
-    public RESTfulResult updateEnactoryResult(@RequestBody(required = false) Map<String, Object> mapValue);
+    @PostMapping("api/v1/truckTms/tmstruckenfactoryresults/enFactoryResultByPDA")
+    public RESTfulResult enFactoryResultByPDA(@RequestBody(required = false) Map<String, Object> mapValue);
 
 
     //修改装车点

src/main/java/com/steerinfo/dil/service/IQmsQueueListService.java

@@ -23,7 +23,7 @@ import java.util.Map;
 public interface IQmsQueueListService{
 
     //添加汽车排队链表
-    int addQueueList(String orderNumber);
+    int addQueueList(Map<String, Object> map);
 
     //进厂排队转移(仓库排队转移) 新增一条链表 修改实绩链表Id
     int changeQueue(Map<String, Object> map);

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

@@ -44,14 +44,12 @@ public class QmsQueueListServiceImpl implements IQmsQueueListService {
 
     /**
      * 开始排队  添加 链表排序
-     * @param orderNumber 运输订单号
+     * @param map 运输订单号
      * @return
      */
     @Transactional
-    public int addQueueList(String orderNumber){
+    public int addQueueList(Map<String, Object> map){
         QmsQueueList qmsQueueList = new QmsQueueList();
-        Map<String, Object> map = new HashMap<>();
-        map.put("orderNumber", orderNumber);
         //通过运输订单号查询 实绩中  网格Id 及 运力Id
         Map<String, Object> listResultMap = qmsQueueListMapper.getQueueResultByOrderNumber(map);
         map.putAll(listResultMap);
@@ -260,11 +258,10 @@ public class QmsQueueListServiceImpl implements IQmsQueueListService {
         QmsQueueResult qmsQueueResult = new QmsQueueResult();
         qmsQueueResult.setResultId(resultId);
 
-
         qmsQueueResult.setResultEndTime(new Date());
         int i1 = qmsQueueResultMapper.updateByPrimaryKeySelective(qmsQueueResult);
         // 排队结束添加进厂作业
-        tmsTruckFeign.updateEnactoryResult(map);
+        tmsTruckFeign.enFactoryResultByPDA(map);
 
         return i + i1;
     }

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

@@ -360,7 +360,7 @@
 <!--  通过运输订单号 或实绩Id 关联 实绩总表 查询 排队实绩 -->
   <select id="getQueueResultByOrderNumber" parameterType="java.util.Map" resultType="java.util.Map">
     select
-           OO.CAPACITY_ID "capacityId",
+           RDC.CAPACITY_ID "capacityId",
            QQR.GRID_ID "gridId",
            QQR.RESULT_ID "resultId",
            QQR.LIST_ID "listId"
@@ -369,12 +369,14 @@
                      on OO.ORDER_ID = TTR.ORDER_ID
            left join QMS_QUEUE_RESULT QQR
                      on QQR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+           left join RMS_DRIVER_CAPACITY RDC
+                     on RDC.DRIVER_CAPACITY_ID = OO.DRIVER_CAPACITY_ID
     <where>
       <if test="orderNumber != null">
         OO.ORDER_NUMBER = #{orderNumber}
       </if>
       <if test="resultId != null">
-        QQR.RESULT_ID = #{resultId}
+       and QQR.RESULT_ID = #{resultId}
       </if>
     </where>
 

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

@@ -679,7 +679,7 @@
     <!-- 车辆进入电子围栏后触发排队申请 -->
     <select id="queryCIdAndTIdByOrderNumber" parameterType="string" resultType="java.util.Map">
         select OO.ORDER_ID         "orderId",
-               OO.CAPACITY_ID      "capacityId",
+               RDC.CAPACITY_ID      "capacityId",
                OOM.MATERIAL_ID     "materialId",
                TTR.RESULT_TOTAL_ID "resultTotalId",
                OO.ORDER_TYPE       "orderType"
@@ -688,6 +688,8 @@
                            on TTR.ORDER_ID = OO.ORDER_ID
                  left join OMSTRUCK_ORDER_MATERIAL OOM
                            on OOM.ORDER_ID = OO.ORDER_ID
+                 left join RMS_DRIVER_CAPACITY RDC
+                            on OO.DRIVER_CAPACITY_ID = RDC.DRIVER_CAPACITY_ID
         where OO.ORDER_NUMBER = #{orderNumber}
     </select>
 
@@ -843,15 +845,15 @@
         QQR.RESULT_ID "resultId",
         (
         case
-            when OO.ORDER_TYPE = 3 then
+            when OO.ORDER_TYPE in (5, 6, 7, 8) then
             (
                 select APO.PURCHASE_ORDER_NO from AMS_PURCHASE_ORDER APO
-                where APO.PURCHASE_ORDER_ID = OO.ORDER_ID
+                where APO.PURCHASE_ORDER_ID = OO.ORDER_PLAN_ID
             )
-            when OO.ORDER_TYPE in (1, 2) then
+            when OO.ORDER_TYPE in (1, 2, 3) then
             (
                 select ASO.SALE_NUMBER from AMS_SALE_ORDER ASO
-                where ASO.SALE_ORDER_ID = OO.ORDER_ID
+                where ASO.SALE_ORDER_ID = OO.ORDER_PLAN_ID
             )
         end
         ) "orderNo",
@@ -968,8 +970,10 @@
         QQR.RESULT_START_TIME "resultStartTime"
 
         from OMSTRUCK_ORDER OO
+        left join RMS_DRIVER_CAPACITY RDC
+        on RDC.DRIVER_CAPACITY_ID = OO.DRIVER_CAPACITY_ID
         left join RMS_CAPACITY RC
-        on RC.CAPACITY_ID = OO.CAPACITY_ID
+        on RC.CAPACITY_ID = RDC.CAPACITY_ID
         left join TMSTRUCK_TOTAL_RESULT TTR
         on TTR.ORDER_ID = OO.ORDER_ID
         left join QMS_QUEUE_RESULT QQR
@@ -1211,7 +1215,7 @@
         on RG2.GATEPOST_ID = QQG2.QUEUE_LOCATION_ID
 
         where QQR.RESULT_TRANSFER_TIME is not null
-        and QQL.DELETED = 0
+--         and QQL.DELETED = 0
         and QQG1.GRID_TYPE = 3
         )
         <where>
@@ -1375,7 +1379,7 @@
         left join RMS_CAPACITY RC
         on RC.CAPACITY_ID = QQR.CAPACITY_ID
         where QQR.RESULT_INSERT_TIME is not null
-        and QQR.RESULT_END_TIME is null
+--         and QQR.RESULT_END_TIME is null
         )
         <where>
             <if test="orderNumber != null">
@@ -1508,9 +1512,11 @@
         on RC.CAPACITY_ID = QQR.CAPACITY_ID
         left join QMS_QUEUE_GRID QQG
         on QQG.GRID_ID = QQR.GRID_ID
-        <if test="gridType = 1">
-            where QQG.GRID_TYPE = #{gridType}
-        </if>
+        <where>
+            <if test="gridType != null">
+                QQG.GRID_TYPE = #{gridType}
+            </if>
+        </where>
         )
         <where>
             <if test="orderNumber != null">
@@ -2127,7 +2133,7 @@
         from RMS_PWAREHOUSE_GRID RPG
         where RPG.PLATFORM_ID = QQG2.QUEUE_LOCATION_ID)
         where QQR.RESULT_TRANSFER_TIME is not null
-        and QQL.DELETED = 0
+--         and QQL.DELETED = 0
         and QQG1.GRID_TYPE = 1
         )
         <where>