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

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

@@ -8,10 +8,12 @@ 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.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
+import java.util.Map;
 
 /*
  * 后台处理程序
@@ -37,4 +39,16 @@ public class BackgroundProcessingController extends BaseRESTfulController {
         }
         return success("关闭成功");
     }
+
+    @ApiOperation(value = "更改所属厂区方法")
+    @PostMapping("/updatePurOrgId")
+    public RESTfulResult updatePurOrgId(@RequestBody(required = false) Map<String, Object> map){
+        return success(backgroundProcessingService.updatePurOrgId(map));
+    }
+
+    @ApiOperation(value = "删除没用的表实绩 ")
+    @PostMapping("/deleteErrorResult")
+    public RESTfulResult deleteErrorResult(String orderNumber){
+        return success(backgroundProcessingService.deleteErrorResult(orderNumber));
+    }
 }

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

@@ -302,14 +302,22 @@ public class OMSController {
                                             Integer apiId,
                                             Integer pageNum,
                                             Integer pageSize,
-                                            Integer orderType,
                                             Integer orderStatus,
                                             String con,
-                                            @RequestParam String carrierSsoId,
-                                                   Integer shipperId
+                                            @RequestParam Integer saleOrderId
     )
     {
-        return omsFeign.getDriverInfoForSale(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, orderType, orderStatus, con,carrierSsoId,shipperId);
+        return omsFeign.getDriverInfoForSale(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize,orderStatus, con,saleOrderId);
+    }
+    @PostMapping("/getDriverInfoForSale1")
+    public Map<String,Object> getDriverInfoForSale1(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                   Integer orderStatus,
+                                                   String con,
+                                                   String numberPlate,
+                                                   @RequestParam Integer saleOrderId
+    )
+    {
+        return omsFeign.getDriverInfoForSale1(mapValue==null?new HashMap<>():mapValue,orderStatus, con,numberPlate,saleOrderId);
     }
 
 

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

@@ -214,4 +214,13 @@ public class OTMSController {
         return otmsFeign.getCurrentLocation(capcityNumber);
     }
 
+    //在途订单列表
+    @PostMapping("/transportationPerformance")
+    public RESTfulResult transportationPerformance(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                   @RequestParam(required = true,defaultValue = "479",name = "apiId")Integer apiId,
+                                                   @RequestParam(required = false,name = "pageNum")Integer pageNum,
+                                                   @RequestParam(required = false,name = "pageSize")Integer pageSize){
+        return otmsFeign.transportationPerformance(mapValue!=null?mapValue:new HashMap<>(),apiId,pageNum,pageSize);
+    }
+
 }

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

@@ -2022,6 +2022,17 @@ public class TMSController extends BaseRESTfulController {
                                                           String endTime) {
         return tmsTruckFeign.getInwardReport(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, startTime, endTime);
     }
+    @ApiOperation(value="")
+    @PostMapping("/getLoaderForResultDetail")
+    public Map<String, Object> getLoaderForResultDetail(@RequestBody(required=false) Map<String,Object> mapValue,
+                                               Integer apiId,
+                                               Integer pageNum,
+                                               Integer pageSize,
+                                               String startTime,
+                                               String endTime,
+                                               String con) {
+        return tmsTruckFeign.getLoaderForResultDetail(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, startTime, endTime,con);
+    }
 
 
     @PostMapping("/sendMeasureCommission")

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

@@ -1,6 +1,7 @@
 package com.steerinfo.dil.controller;
 
 
+import com.steerinfo.dil.feign.OtmsFeign;
 import com.steerinfo.dil.feign.TmsTruckFeign;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -14,26 +15,27 @@ import java.util.Map;
 @RequestMapping("apis")
 public class ZhongJiaoXingLuContoller {
 
-    private TmsTruckFeign tmsTruckFeign;
+    @Autowired
+    private OtmsFeign otmsFeign;
 
     //偏离预警回调示例
     @PostMapping("/abnormalLineWarn")
     public String abnormalLineWarn(@RequestParam(value = "data") String data) throws Exception {
-        tmsTruckFeign.abnormalLineWarn(data);
+        otmsFeign.abnormalLineWarn(data);
 
         return "success";
     }
     //停车预警回调示例
     @PostMapping("/parkWarn")
     public String parkWarn(@RequestParam(value = "data") String data) throws Exception {
-        tmsTruckFeign.parkWarn(data);
+        otmsFeign.parkWarn(data);
         return "success";
     }
     //离线预警回调示例
     @PostMapping("/offLineWarn")
     public String offLineWarn(@RequestParam(value = "data") String data) throws Exception {
 
-        tmsTruckFeign.offLineWarn(data);
+        otmsFeign.offLineWarn(data);
         return "success";
     }
 

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

@@ -134,11 +134,18 @@ public interface OmsFeign {
                                             @RequestParam("apiId")      Integer apiId,
                                             @RequestParam("pageNum")    Integer pageNum,
                                             @RequestParam("pageSize")   Integer pageSize,
-                                            @RequestParam("orderType")  Integer orderType,
                                             @RequestParam("orderStatus")Integer orderStatus,
                                             @RequestParam("con")        String con,
-                                            @RequestParam("carrierSsoId")  String carrierSsoId,
-                                            @RequestParam("shipperId") Integer shipperId
+                                            @RequestParam("saleOrderId") Integer saleOrderId
+    );
+
+
+    @PostMapping(value = "api/v1/oms/omstruckorders/getDriverInfoForSale1")
+    Map<String,Object> getDriverInfoForSale1(@RequestBody(required=false) Map<String,Object> mapValue,
+                                            @RequestParam("orderStatus")Integer orderStatus,
+                                            @RequestParam("con")        String con,
+                                            @RequestParam("numberPlate")  String numberPlate,
+                                            @RequestParam("saleOrderId") Integer saleOrderId
     );
 
     /**

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

@@ -17,6 +17,13 @@ public interface OtmsFeign {
                                                     @RequestParam(required = true,defaultValue = "468",name = "apiId")Integer apiId,
                                                     @RequestParam(required = false,name = "pageNum")Integer pageNum,
                                                     @RequestParam(required = false,name = "pageSize")Integer pageSize);
+
+    //在途订单列表
+    @PostMapping("/api/v1/otms/pathDisplay/transportationPerformance")
+    public RESTfulResult transportationPerformance(@RequestBody Map<String,Object> mapValue,
+                                                    @RequestParam(required = true,defaultValue = "468",name = "apiId")Integer apiId,
+                                                    @RequestParam(required = false,name = "pageNum")Integer pageNum,
+                                                    @RequestParam(required = false,name = "pageSize")Integer pageSize);
     //已完成订单列表
     @PostMapping("/api/v1/otms/pathDisplay/getFinishTruckOrderInfo")
     public RESTfulResult getFinishTruckOrderInfo(@RequestBody Map<String,Object> mapValue,
@@ -107,4 +114,11 @@ public interface OtmsFeign {
     );
     @GetMapping("/api/v1/otms/pathDisplay/getCurrentLocation")
     public RESTfulResult getCurrentLocation(@RequestParam("capcityNumber") String capcityNumber) throws Exception;
+
+    @PostMapping("/api/v1/otms/pathDisplay/offLineWarn")
+    public String offLineWarn(@RequestParam(value = "data") String data) throws Exception;
+    @PostMapping("/api/v1/otms/pathDisplay/parkWarn")
+    public String parkWarn(@RequestParam(value = "data",required = false) String data) throws Exception;
+    @PostMapping("/api/v1/otms/pathDisplay/abnormalLineWarn")
+    public String abnormalLineWarn(@RequestParam(value = "data") String data) throws Exception;
 }

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

@@ -479,6 +479,17 @@ public interface TmsTruckFeign {
                                    @RequestParam String startTime,
                                    @RequestParam String endTime);
 
+
+
+    @PostMapping("api/v1/truckTms/statisticalReport/getLoaderForResultDetail")
+    Map<String, Object> getLoaderForResultDetail(@RequestBody(required = false) Map<String, Object> mapValue,
+                                   @RequestParam("apiId") Integer apiId,
+                                   @RequestParam("pageNum") Integer pageNum,
+                                   @RequestParam("pageSize") Integer pageSize,
+                                   @RequestParam("startTime") String startTime,
+                                   @RequestParam("endTime") String endTime,
+                                                 @RequestParam("con") String con);
+
     @PostMapping("api/v1/truckTms/statisticalReport/getUnLoading")
     Map<String, Object> getUnLoading(@RequestBody(required = false) Map<String, Object> mapValue,
                                      @RequestParam Integer apiId,

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

@@ -2,6 +2,7 @@ package com.steerinfo.dil.mapper;
 
 import org.mapstruct.Mapper;
 
+import java.math.BigDecimal;
 import java.util.Map;
 
 @Mapper
@@ -9,8 +10,11 @@ public interface BackgroundProcessingMapper {
     //通过采购订单号关闭一车多趟
     int closePurOrderMoreTrips(String purchaseOrderNo);
 
-    int updatePurOrgId(Integer orderId);
+    Integer getOrderType(Map<String, Object> map);
 
-    Integer getOrderType(Integer orderId);
+    int updatePurOrderOrgId(Map<String, Object> map);
 
+    Map<String, Object> getOrderMesByOrderNum(String orderNumber);
+
+    Map<String, Object> getEnFactoryResult(BigDecimal resultTotalId);
 }

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

@@ -1,5 +1,9 @@
 package com.steerinfo.dil.service;
 
+import java.util.Map;
+
 public interface IBackgroundProcessService {
-    int updatePurOrgId(Integer orderId);
+
+    int updatePurOrgId(Map<String, Object> map);
+
 }

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

@@ -1,23 +1,49 @@
 package com.steerinfo.dil.service.impl;
 
 import com.steerinfo.dil.mapper.BackgroundProcessingMapper;
+import com.steerinfo.dil.mapper.UniversalMapper;
 import com.steerinfo.dil.service.IBackgroundProcessService;
+import com.steerinfo.dil.util.DataChange;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
 @Service(value = "backgroundProcessingService")
 public class BackgroundProcessingServiceImpl implements IBackgroundProcessService {
 
     @Autowired
-    BackgroundProcessingMapper backgroundProcessingMapper;
+    private BackgroundProcessingMapper backgroundProcessingMapper;
+
 
+    /**
+     * 更新订单所属厂区
+     * @param map
+     * @return
+     */
     @Override
-    public  int updatePurOrgId(Integer orderId) {
-        //获取订单类型
-        Integer orderType = backgroundProcessingMapper.getOrderType(orderId);
-        if(orderType == 10 || orderType == 20){
-            backgroundProcessingMapper.updatePurOrgId(orderId);
+    public int updatePurOrgId(Map<String, Object> map) {
+        return backgroundProcessingMapper.updatePurOrderOrgId(map);
+    }
+
+    /**
+     * 删除重复实绩
+     * @param orderNumber
+     * @return
+     */
+    public int deleteErrorResult(String orderNumber) {
+        Map<String, Object> orderMes = backgroundProcessingMapper.getOrderMesByOrderNum(orderNumber);
+        int orderType = DataChange.dataToBigDecimal(orderMes.get("orderType")).intValue();
+        List<Integer> arrayList = Arrays.asList(11, 15, 16, 21); //没有固定路线不支持此操作
+        if(arrayList.contains(orderType)){
+            return 0;
         }
-        return 1;
+        BigDecimal resultTotalId = DataChange.dataToBigDecimal(orderMes.get("resultTotalId"));
+
+        return 0;
     }
 }

src/main/resources/application-dev.yml

@@ -40,8 +40,7 @@ openfeign:
     url: ${OTMSFEIGN_URL:172.16.33.162:8038}
     #url: ${OTMSFEIGN_URL:localhost:8038}
 piction:
-  #path: /usr/share/nginx/html/image
-  #path: /test/data/nginx/html/image
+  #path: C:\Users\24390\Desktop\work\a
   #path: D:\Code\work\jpg
   path: /shared
 

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

@@ -9,12 +9,30 @@
     </update>
 
     <update id="updatePurOrderOrgId" parameterType="java.util.Map">
-
-    </update>
-    <update id="updatePurOrgId">
+        update AMS_PURCHASE_ORDER APO
+        set APO.PURCHASING_ORGANIZATION_ID = #{orgId}
+        where APO.PURCHASE_ORDER_NO = #{purchaseOrderNo}
     </update>
+
     <select id="getOrderType" resultType="java.lang.Integer" parameterType="java.lang.Integer">
         select OO.ORDER_TYPE from OMSTRUCK_ORDER OO
         where oo.ORDER_ID = #{orderId}
     </select>
+
+    <select id="getOrderMesByOrderNum" resultType="java.util.Map">
+        select OO.ORDER_ID  "orderId",
+               OO.ORDER_TYPE    "orderType",
+               TTR.RESULT_TOTAL_ID  "resultTotalId"
+        from OMSTRUCK_ORDER OO
+                 left join TMSTRUCK_TOTAL_RESULT TTR on OO.ORDER_ID = TTR.ORDER_ID
+        where OO.ORDER_NUMBER = #{orderNumber}
+    </select>
+
+    <select id="getEnFactoryResult" resultType="java.util.Map">
+        select TER.RESULT_ID    "resultId",
+               TER.SEGMEN_SQE   "segmentSqe",
+               TER.RESULT_ENTRY_GATE_TIME   "resultEntryGateTime"
+        from TMSTRUCK_ENFACTORY_RESULT TER
+        where TER.RESULT_TOTAL_ID = #{resultTotalId}
+    </select>
 </mapper>

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

@@ -694,10 +694,8 @@
                         CONCAT(DB.RESULT_FOREIGN_SHIP_NAME, '"' || RM.MATERIAL_NAME || '"') "value"
                  from DIL_BATCH DB
                           left join RMS_MATERIAL RM on RM.MATERIAL_ID = DB.MATERIAL_ID
+                          join AMS_PURCHASE_ORDER APO on APO.BATCH_ID = DB.BATCH_ID
                  where DB.RESULT_FOREIGN_SHIP_NAME is not null
-                <if test="materialId != null">
-                    and DB.MATERIAL_ID = #{materialId}
-                </if>
              )
         where instr("foreignShipName", #{index}) > 0