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

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

@@ -1908,6 +1908,12 @@ public class AMScontroller{
     }
 
 
+    @ApiOperation(value = "批量关闭分录")
+    @PostMapping("/closingEntries")
+    public Map<String, Object> closingEntries(@RequestBody List<Map<String, Object>> mapList){
+        return amsFeign.closingEntries(mapList);
+    }
+
     @ApiOperation(value = "查询内转物流运输单价")
     @PostMapping("/getInwardPriceBy")
     public Map<String,Object>getInwardPriceBy(@RequestBody(required = false)Map<String,Object>mapvalue){

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

@@ -255,4 +255,9 @@ public class OTMSController {
     public RESTfulResult getLocationForAddress(@RequestParam("address") String address){
         return otmsFeign.getLocationForAddress(address);
     }
+
+    @PostMapping("/getAddress")
+    public RESTfulResult getAddress(@RequestBody Map<String,Object> map){
+        return otmsFeign.getAddress(map);
+    }
 }

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

@@ -859,8 +859,7 @@ public class RMScontroller {
         return rmsFeign.insertOilPrice(map);
     }
 
-    @ApiOperation(value = "更新公告信息", notes = "根据dilNotice对象创建")
-    @ApiImplicitParam(name = "dilNotice", value = "详细实体dilNotice", required = true, dataType = "dilNotice")
+    @ApiOperation(value = "更新油价信息", notes = "根据油价ID来更新油价")
     @PostMapping(value = "/updateOilPrice")
     public Map<String, Object> updateOilPrice(@RequestBody(required = false) Map<String, Object> mapValue) {
         return rmsFeign.updateOilPrice(mapValue);

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

@@ -463,6 +463,16 @@ public interface AmsFeign {
                                              @RequestParam Integer pageNum,
                                              @RequestParam Integer pageSize,
                                              @RequestParam Integer apiId);
+
+
+
+    @ApiOperation(value = "关闭分录")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "list", value = "批量关闭分录", required = false, dataType = "java.util.List")
+    })
+    @PostMapping(value = "/api/v1/ams/amssaleorders/closingEntries")
+    Map<String, Object> closingEntries(@RequestBody List<Map<String, Object>> mapList);
+
     /**
      * 查询已上报销售订单信息
      * @param mapValue

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

@@ -143,4 +143,14 @@ public interface OtmsFeign {
     //查询地址经纬度
     @GetMapping("/api/v1/otms/pathDisplay/getLocationForAddress")
     public RESTfulResult getLocationForAddress(@RequestParam("address") String address);
+
+    /**
+     * @author:zyf
+     * @version:1.0
+     * @Date:2022-10-19
+     * @Description:逆地址解析
+     */
+    @PostMapping("/api/v1/otms/Test/getAddress")
+    public RESTfulResult getAddress(@RequestBody Map<String,Object> map);
+
 }

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

@@ -251,6 +251,15 @@ public interface UniversalMapper {
     //查询多拼数据
     BigDecimal queueMore(BigDecimal orderId);
 
+    //查询实绩
+    BigDecimal sumNetWeight(BigDecimal orderId);
+
+    //状态设为2
+    int updateStatusTwo(BigDecimal orderId);
+
+    //状态设为7
+    int updateStatusSeven(BigDecimal orderId);
+
     //查询单拼数据
     BigDecimal queueSingle(BigDecimal orderId);
 

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

@@ -240,28 +240,41 @@ public class UniversalServiceImpl implements UniversalService {
      * 关闭过期运输订单
      * @return
      */
-    @Scheduled(cron = "0 0 8 * * ?")
+    @Scheduled(cron = "0 0,5 8 * * ?")
     public void closePassedOrder() {
-        System.out.println("我在十一点被执行");
         List<Map<String,Object>> passedOrderList = universalMapper.findPassedOrder();
         System.out.println("关闭的未出厂过期订单如下：<" + passedOrderList + ">");
-        int result = universalMapper.closePassedOrder();
+        int result=0;
+        //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);
+            if (passedOrderList.isEmpty()){
+
+            }else {
+                for (Map<String, Object> map : passedOrderList) {
+                    BigDecimal orderId = (BigDecimal) map.get("orderId");
+                    //分两种情况关单
+                    //净重为0状态设为2，不为零设为7
+                    BigDecimal bigDecimal = universalMapper.sumNetWeight(orderId);
+                    if (bigDecimal.compareTo(BigDecimal.ZERO)!=0){
+                        result+=universalMapper.updateStatusTwo(orderId);
+                    }else {
+                        result+=universalMapper.updateStatusSeven(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){
 
         }

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

@@ -1178,21 +1178,27 @@
     </select>
 
     <select id="findPassedOrder" resultType="java.util.Map">
-        SELECT OO.ORDER_ID "orderId",
-               RC.CAPACITY_NUMBER "capacityNumber"
+        SELECT
+        distinct
+        OO.ORDER_ID "orderId",RC.CAPACITY_NUMBER "capacityNumber"
         FROM OMSTRUCK_ORDER OO
                  LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
                            ON TTR.ORDER_ID = OO.ORDER_ID
-                 LEFT JOIN TMSTRUCK_LEAVE_FACTORY_RESULT TLFR
-                           ON TLFR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+                 LEFT JOIN TMSTRUCK_ENFACTORY_RESULT TER
+                 ON TER.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
                  LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
                            ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
                  LEFT JOIN RMS_CAPACITY RC
                            ON RC.CAPACITY_ID = OO.CAPACITY_ID
+                 LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
+                 ON TWR.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
         WHERE OO.ORDER_TYPE = 1
           AND OO.ORDER_STATUS IN (4,5)
-          AND TLFR.RESULT_OUT_GATE_TIME IS NULL
-          AND ASOM.SALE_DATE_OF_RECEIPT &lt; sysdate
+          AND TER.RESULT_ENTRY_GATE_TIME IS NULL
+          and (TWR.RESULT_TARE_WEIGHT =0
+					or TWR.RESULT_TARE_WEIGHT is NULL)
+          AND ASOM.SALE_DATE_OF_RECEIPT between
+          sysdate-1 and sysdate
           ORDER BY OO.ORDER_ID DESC
     </select>
 
@@ -1353,20 +1359,27 @@
 
     <update id="closePassedOrder" >
         UPDATE OMSTRUCK_ORDER OO
-        SET OO.ORDER_STATUS = 7
+        SET OO.ORDER_STATUS=7
         WHERE OO.ORDER_ID IN
-        (SELECT OO.ORDER_ID
+        (SELECT OO.ORDER_ID ,RC.CAPACITY_NUMBER "capacityNumber"
         FROM OMSTRUCK_ORDER OO
-        LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
-        ON TTR.ORDER_ID = OO.ORDER_ID
-        LEFT JOIN TMSTRUCK_LEAVE_FACTORY_RESULT TLFR
-        ON TLFR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
-        LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
-        ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
+                 LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+                           ON TTR.ORDER_ID = OO.ORDER_ID
+                 LEFT JOIN TMSTRUCK_ENFACTORY_RESULT TER
+                 ON TER.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
+                 LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
+                           ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
+                 LEFT JOIN RMS_CAPACITY RC
+                           ON RC.CAPACITY_ID = OO.CAPACITY_ID
+                 LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
+                 ON TWR.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
         WHERE OO.ORDER_TYPE = 1
-        AND OO.ORDER_STATUS IN (4,5)
-        AND TLFR.RESULT_OUT_GATE_TIME IS NULL
-        AND ASOM.SALE_DATE_OF_RECEIPT &lt; sysdate
+          AND OO.ORDER_STATUS IN (4,5)
+          AND TER.RESULT_ENTRY_GATE_TIME IS NULL
+          and (TWR.RESULT_TARE_WEIGHT =0
+					or TWR.RESULT_TARE_WEIGHT is NULL)
+          AND ASOM.SALE_DATE_OF_RECEIPT between
+          sysdate-1 and sysdate
         )
     </update>
 
@@ -1392,6 +1405,25 @@
         where oo.order_id=#{orderId}
     </select>
 
+    <select id="sumNetWeight" resultType="java.math.BigDecimal">
+       select sum(TWR.RESULT_NET_WEIGHT) "sum"  from TMSTRUCK_TOTAL_RESULT TTR
+       LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
+       ON TWR.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
+       WHERE TTR.ORDER_ID=#{orderId}
+    </select>
+
+    <update id="updateStatusTwo">
+        update OMSTRUCK_ORDER OO
+        set OO.ORDER_STATUS=2
+        WHERE OO.ORDER_ID=#{orderId}
+    </update>
+
+    <update id="updateStatusSeven">
+        update OMSTRUCK_ORDER OO
+        set OO.ORDER_STATUS=7
+        WHERE OO.ORDER_ID=#{orderId}
+    </update>
+
     <select id="queueSingle" resultType="java.math.BigDecimal">
         select qql.LIST_ID
         from OMSTRUCK_ORDER oo