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

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

@@ -0,0 +1,38 @@
+package com.steerinfo.dil.controller;
+
+
+import com.steerinfo.dil.mapper.BackgroundProcessingMapper;
+import com.steerinfo.dil.service.impl.BackgroundProcessingServiceImpl;
+import com.steerinfo.dil.util.BaseRESTfulController;
+import com.steerinfo.framework.controller.RESTfulResult;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/*
+ * 后台处理程序
+ */
+
+@RestController
+@RequestMapping("${api.version}/bp")
+public class BackgroundProcessingController extends BaseRESTfulController {
+
+    @Autowired
+    private BackgroundProcessingMapper backgroundProcessingMapper;
+
+    @Autowired
+    private BackgroundProcessingServiceImpl backgroundProcessingService;
+
+
+    @ApiOperation(value = "关闭一车多趟方法")
+    @PostMapping("/closePurOrderMoreTrips")
+    public RESTfulResult closePurOrderMoreTrips(String purchaseOrderNo) {
+        int i = backgroundProcessingMapper.closePurOrderMoreTrips(purchaseOrderNo);
+        if(i != 1){
+            return failed("关闭失败！没有此采购订单");
+        }
+        return success("关闭成功");
+    }
+}

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

@@ -793,4 +793,9 @@ public class UniversalController extends BaseRESTfulController {
         return success(list);
     }
 
+    @ApiModelProperty(value = "司机APP订单小红点")
+    @GetMapping("/getOrderNum")
+    public int getOrderNum(@RequestParam("capacityNumber") String capacityNumber){
+        return universalMapper.getOrderNum(capacityNumber);
+    }
 }

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

@@ -0,0 +1,11 @@
+package com.steerinfo.dil.mapper;
+
+import org.mapstruct.Mapper;
+
+import java.util.Map;
+
+@Mapper
+public interface BackgroundProcessingMapper {
+    //通过采购订单号关闭一车多趟
+    int closePurOrderMoreTrips(String purchaseOrderNo);
+}

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

@@ -11,7 +11,7 @@ import java.math.BigDecimal;
 public interface DilVersionMapper extends IBaseMapper<DilVersion, BigDecimal> {
 
     //查询最大主键
-    @Select("select max(DV.VERSION_ID) + 1 from DIL_VERSION")
+    @Select("select max(DV.VERSION_ID) + 1 from DIL_VERSION DV")
     BigDecimal selectMaxId();
 
     //查询最新的APP版本号

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

@@ -181,4 +181,7 @@ public interface UniversalMapper {
 
     //边输边查发站到站
     List<Map<String, Object>> getArrivalByLike(String index);
+
+    //查询已下发订单数量  -->APP小红点
+    Integer getOrderNum(String capacityNumber);
 }

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

@@ -0,0 +1,8 @@
+package com.steerinfo.dil.service.impl;
+
+import org.springframework.stereotype.Service;
+
+@Service(value = "backgroundProcessingService")
+public class BackgroundProcessingServiceImpl {
+
+}

src/main/resources/application-dev.yml

@@ -20,7 +20,7 @@ openfeign:
   QmsTruckFeign:
     url: ${QMSTRUCKFEIGN_URL:172.16.33.162:8017}
   TmsTrainFeign:
-    url: ${TMSTRAINFEIGN_URL:172.16.33.162:8004}
+    url: ${TMSTRAINFEIGN_URL:localhost:8004}
   TmsTruckFeign:
     url: ${TMSTRUCKFEIGN_URL:172.16.33.162:8008}
   TmsshipFeign:
@@ -30,7 +30,7 @@ openfeign:
   WMSFeign:
     url: ${WMSFEIGN_URL:172.16.33.162:8093}
   OMSFeign:
-    url: ${OMSFEIGN_URL:172.16.33.162:8016}
+    url: ${OMSFEIGN_URL:localhost:8016}
   RmsFeign:
     url: ${RMSFEIGN_HRL:172.16.33.162:8014}
   JoinFeign:

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

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.steerinfo.dil.mapper.BackgroundProcessingMapper">
+
+    <update id="closePurOrderMoreTrips" parameterType="string">
+        update AMS_PURCHASE_ORDER APO
+        set APO.IS_MORE_TRIPS = null
+        where APO.PURCHASE_ORDER_NO = #{purchaseOrderNo}
+    </update>
+
+    <update id="updatePurOrderOrgId" parameterType="java.util.Map">
+
+    </update>
+</mapper>

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

@@ -938,4 +938,12 @@
         FROM RMSTRAIN_ARRIVAL_SEND RAS
         WHERE instr(RAS.ARRIVAL_NAME,#{index}) > 0
     </select>
+
+    <select id="getOrderNum" parameterType="string" resultType="java.lang.Integer">
+        SELECT COUNT(OO.ORDER_ID)
+        FROM OMSTRUCK_ORDER OO
+                 LEFT JOIN RMS_CAPACITY RC ON OO.CAPACITY_ID = RC.CAPACITY_ID
+        WHERE RC.CAPACITY_NUMBER = #{capacityNumber}
+              AND OO.ORDER_STATUS = 4
+    </select>
 </mapper>