Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-API

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

@@ -1,6 +1,7 @@
 package com.steerinfo.dil.controller;
 
 import com.steerinfo.dil.feign.AmsFeign;
+import com.steerinfo.dil.service.impl.UniversalServiceImpl;
 import com.steerinfo.framework.controller.RESTfulResult;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -27,6 +28,15 @@ public class AMScontroller{
     @Autowired
     AmsFeign amsFeign;
 
+    /*@Autowired
+    UniversalServiceImpl universalService;*/
+
+    /*@GetMapping("/test")
+    public int test1(){
+        universalService.closePassedOrder();
+        return 1;
+    }*/
+
     @ApiOperation(value="查询运输预约")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
@@ -2074,4 +2084,20 @@ public class AMScontroller{
         }
         return amsFeign.updateTransPrice(mapValue);
     }
+    @PostMapping("/getwz")
+    @ApiOperation(value = "查询物资")
+    public Map<String, Object> getwz(@RequestBody(required = false) Map<String, Object> mapValue) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getwz(mapValue);
+    }
+    @PostMapping("/getcargonameId")
+    @ApiOperation(value = "查询联动公式数据")
+    public Map<String, Object> getcargonameId(@RequestBody(required = false) Map<String, Object> mapValue) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getcargonameId(mapValue);
+    }
 }

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

@@ -1783,4 +1783,10 @@ public interface AmsFeign {
 
     @PostMapping("/api/v1/ams/amscontracttruckprices/updateTransPrice")
     Map<String, Object> updateTransPrice(@RequestBody Map<String, Object> mapList);
+
+    @PostMapping("/api/v1/ams/amscontracttruckprices/getwz")
+    Map<String, Object> getwz(@RequestBody Map<String, Object> mapList);
+
+    @PostMapping("/api/v1/ams/amscontracttruckprices/getcargonameId")
+    Map<String, Object> getcargonameId(@RequestBody Map<String, Object> mapList);
 }

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

@@ -247,4 +247,15 @@ public interface UniversalMapper {
 
     List<Map<String, Object>> getLuhaoNum(@Param("orderId") BigDecimal orderId, @Param("materialId") BigDecimal materialId);
 
+
+    //查询多拼数据
+    BigDecimal queueMore(BigDecimal orderId);
+
+    //查询单拼数据
+    BigDecimal queueSingle(BigDecimal orderId);
+
+    //删除单拼数据
+    int delectQueueS(BigDecimal capacityIdS);
+    //删除多拼数据
+    int delectQueueM(BigDecimal capacityIdM);
 }

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

@@ -244,6 +244,26 @@ public class UniversalServiceImpl implements UniversalService {
         List<Map<String,Object>> passedOrderList = universalMapper.findPassedOrder();
         System.out.println("关闭的未出厂过期订单如下：<" + passedOrderList + ">");
         int result = universalMapper.closePassedOrder();
+        try {
+            for (Map<String, Object> map : passedOrderList) {
+                BigDecimal orderId = (BigDecimal) map.get("orderId");
+                //查询多拼的数据
+                BigDecimal capacityIdM =universalMapper.queueMore(orderId);
+                if (capacityIdM !=null){
+                    //删除多拼
+                    universalMapper.delectQueueM(capacityIdM);
+                }
+                //查询单拼的数据
+                BigDecimal capacityIdS=universalMapper.queueSingle(orderId);
+                if (capacityIdS !=null){
+                    //删除单拼
+                    universalMapper.delectQueueS(capacityIdS);
+                }
+            }
+        }catch (Exception e){
+
+        }
+
         System.out.println("订单关闭数为：" + result);
     }
 

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

@@ -1370,4 +1370,33 @@
         )
     </update>
 
+    <delete id="delectQueueS">
+        delete from QMS_QUEUE_LIST qql
+        where qql.LIST_ID=#{capacityIdM}
+    </delete>
+
+    <delete id="delectQueueM">
+        delete from QMS_QUEUE_SPELLING_LIST qqsl
+        where qqsl.SPELLING_RESULT_ID=#{capacityIdM}
+    </delete>
+
+    <select id="queueMore" resultType="java.math.BigDecimal">
+        select
+        distinct
+        qqsl.SPELLING_RESULT_ID
+        from OMSTRUCK_ORDER oo
+        LEFT JOIN QMS_QUEUE_RESULT qqr
+        on qqr.capacity_id=oo.capacity_id
+        LEFT JOIN QMS_QUEUE_SPELLING_LIST qqsl
+        on qqsl.queue_result_id=qqr.result_total_id
+        where oo.order_id=#{orderId}
+    </select>
+
+    <select id="queueSingle" resultType="java.math.BigDecimal">
+        select qql.LIST_ID
+        from OMSTRUCK_ORDER oo
+        LEFT JOIN QMS_QUEUE_LIST qql
+        on qql.capacity_id=oo.capacity_id
+        where oo.order_id=#{orderId}
+    </select>
 </mapper>