Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU1/DAL-TMS-TRUCK-API

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

@@ -74,5 +74,16 @@ public interface TmstruckEnfactoryResultMapper extends IBaseMapper<TmstruckEnfac
     List<Map<String, Object>> getEnResult();
 
 
+    //查询是否拼装
+    Map<String, Object> getSteelIsSpelling(BigDecimal resultTotalId);
+
+    //删除多拼队列表实绩
+    int deleteQQSL(Object listId);
+
+    //删除单拼队列实绩
+    int deleteQQL(Object listId);
+
+    //修改排队实绩表添加排队结束时间
+    int updateQQR(Object resultId);
 
 }

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

@@ -182,9 +182,7 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
         int checkMeasureCommission = 0;
         switch (orderType){
             case 1:
-                //发送空委托
-                map.put("firstMC", 1); //空委托依据
-                checkMeasureCommission = tmstruckMeasureCommissionService.addSteelMeasureCommission(map);
+                checkMeasureCommission = steelOrderEnFactory(map, selectMap, resultTotalId);
                 break;
             case 2:
             case 3:
@@ -236,6 +234,39 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
 
     }
 
+    /**
+     * 钢材进厂处理方法
+     * @param map
+     * @param selectMap
+     * @param resultTotalId
+     * @return
+     * @throws Exception
+     */
+    public int steelOrderEnFactory(Map<String, Object> map, Map<String, Object> selectMap,BigDecimal resultTotalId) throws Exception{
+        if(!"OK".equals(selectMap.get("insertUpdateRemark"))){
+            throw new Exception("钢材科未确认进厂！");
+        }
+        //发送空委托
+        map.put("firstMC", 1); //空委托依据
+        int checkMeasureCommission = tmstruckMeasureCommissionService.addSteelMeasureCommission(map);
+        if(checkMeasureCommission == 1){
+            //查询是否拼装
+            Map<String, Object> isSpellingMap = tmstruckEnfactoryResultMapper.getSteelIsSpelling(resultTotalId);
+            int isSpelling = DataChange.dataToBigDecimal(isSpellingMap.get("isSpelling")).intValue();
+            if(isSpelling == 1){
+                //拼装移出队列
+                tmstruckEnfactoryResultMapper.deleteQQSL(isSpellingMap.get("listId"));
+            }else {
+                //单拼移出队列
+                tmstruckEnfactoryResultMapper.deleteQQL(isSpellingMap.get("listId"));
+            }
+            //修改排队实绩表
+            tmstruckEnfactoryResultMapper.updateQQR(isSpellingMap.get("resultId"));
+        }
+        return checkMeasureCommission;
+    }
+
+
     /**
      * 计时作业方法
      * @Author TXF

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

@@ -200,6 +200,8 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
                 measureCommission.put("IsAssembly", false);
             }
         }
+//        System.out.println(measureCommission);
+//        return 1;
         return sendMesToMeasure(measureCommission);
     }
 

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

@@ -435,6 +435,7 @@
             #{item.resultId,jdbcType=DECIMAL}
         </foreach>
     </update>
+
     <delete id="batchDelete" parameterType="java.util.List">
         delete from TMSTRUCK_ENFACTORY_RESULT
         where RESULT_ID in
@@ -673,7 +674,8 @@
         select *
         from (select TER.RESULT_ID       "resultId",
                      TER.SEGMEN_SQE      "segmentSqe", --进厂的路段顺序号
-                     TER.RESULT_ENTRY_GATE_TIME
+                     TER.RESULT_ENTRY_GATE_TIME,
+                     TER.INSERT_UPDATE_REMARK   "insertUpdateRemark"
               from TMSTRUCK_ENFACTORY_RESULT TER
               where TER.RESULT_TOTAL_ID = #{resultTotalId}
                 and TER.RESULT_ENTRY_GATE_TIME is null
@@ -1163,11 +1165,13 @@
             rm.material_specification "materialSpe",
             rm.material_model "materialModel",
             oom.order_material_number "materialNumber",
-            oom.order_material_weight "materialWeight"
+            oom.order_material_weight "materialWeight",
+            RW.WAREHOUSE_NAME "wareHouseName"
         FROM
             omstruck_order oo
                 LEFT JOIN omstruck_order_material oom ON oom.order_id = oo.order_id
                 LEFT JOIN rms_material rm ON rm.material_id = oom.material_id
+                LEFT JOIN RMS_WAREHOUSE RW ON RW.WAREHOUSE_ID = OOM.MATERIAL_PRIORITY
         WHERE
             oo.order_number = #{ orderNumber}
     </select>
@@ -1466,4 +1470,24 @@
         AND TER.SEGMEN_SQE = 5
     </select>
 
+    <select id="getSteelIsSpelling" resultType="map" parameterType="java.math.BigDecimal">
+        select LIST_ID  "listId",
+               IS_SPELLING "isSpelling",
+               RESULT_ID    "resultId"
+        from QMS_QUEUE_RESULT where RESULT_TOTAL_ID = #{resultTotalId}
+    </select>
+
+
+    <delete id="deleteQQSL">
+        delete from QMS_QUEUE_SPELLING_LIST where SPELLING_RESULT_ID = #{listId}
+    </delete>
+
+    <delete id="deleteQQL">
+        delete from QMS_QUEUE_LIST where LIST_ID = #{listId}
+    </delete>
+
+    <update id="updateQQR">
+        update QMS_QUEUE_RESULT QQR set QQR.RESULT_END_TIME = SYSDATE where QQR.RESULT_ID = #{resultId}
+    </update>
+
 </mapper>