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

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

@@ -1148,11 +1148,12 @@ public class AMScontroller{
                                           Integer pageSize,
                                           Integer apiId,
                                           Integer requirementStatus,
-                                          String orgCode) {
+                                          String orgCode,
+                                                       String index) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return amsFeign.getTruckRequirementList(mapValue, pageNum, pageSize, apiId,requirementStatus,orgCode);
+        return amsFeign.getTruckRequirementList(mapValue, pageNum, pageSize, apiId,requirementStatus,orgCode,index);
     }
 
     @PostMapping("/getPurRequirementList")
@@ -1879,4 +1880,33 @@ public class AMScontroller{
     public RESTfulResult matchingDriverTelRecently(@RequestParam String capacityNumber) {
         return amsFeign.matchingDriverTelRecently(capacityNumber);
     }
+
+    @ApiOperation(value = "展示副产品销售订单列表(apiId=481)")
+    @PostMapping("/getFuSaleOrderList")
+    public Map<String, Object> getFuSaleOrderList(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                  Integer pageNum,
+                                                  Integer pageSize,
+                                                  Integer apiId,
+                                                  String con
+    ) {
+        return amsFeign.getFuSaleOrderList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
+    }
+
+    @ApiOperation(value = "修改销售订单中的物资")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "修改销售订单中的物资", required = false, dataType = "java.util.Map")
+    })
+    @PostMapping(value = "/updateAllMaterialInSale")
+    public RESTfulResult updateAllMaterialInSale(@RequestBody Map<String, Object> mapValue) {
+        return amsFeign.updateAllMaterialInSale(mapValue);
+    }
+
+    @ApiOperation(value = "同步关闭金蝶订单")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "同步关闭金蝶订单", required = false, dataType = "java.util.Map")
+    })
+    @PostMapping(value = "/deleteSaleOrderSame")
+    public Map<String,Object> deleteSaleOrderSame(@RequestBody Map<String, Object> mapValue) {
+        return amsFeign.deleteSaleOrderSame(mapValue);
+    }
 }

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

@@ -595,4 +595,24 @@ public class BMSController extends BaseRESTfulController {
                  endTime);
     }
 
-}
+
+
+    @PostMapping("/getInwardWeightTimeDetailsOrder")
+    public Map<String, Object> getInwardWeightTimeDetailsOrder(@RequestBody(required = false) Map<String, Object> mapVal,
+                                                           Integer pageNum,
+                                                           Integer pageSize,
+                                                           Integer apiId,
+                                                           String carrierSsoId,
+                                                           Integer detailStatus,
+                                                           Integer orderType,
+                                                           String userId,
+                                                           String startTime,
+                                                           String endTime) {
+        if (mapVal == null) {
+            mapVal = new HashMap<>();
+        }
+        return bmstruckFeign.getInwardWeightTimeDetailsOrder(mapVal, pageNum, pageSize, apiId, carrierSsoId,detailStatus,orderType,userId, startTime,
+                endTime);
+    }
+
+}

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

@@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -32,8 +33,17 @@ public class BackgroundProcessingController extends BaseRESTfulController {
 
     @ApiOperation(value = "关闭一车多趟方法")
     @PostMapping("/closePurOrderMoreTrips")
-    public RESTfulResult closePurOrderMoreTrips(String purchaseOrderNo) {
+    public RESTfulResult closePurOrderMoreTrips(String purchaseOrderNo, String deleteNoReceiveOrder) {
         int i = backgroundProcessingMapper.closePurOrderMoreTrips(purchaseOrderNo);
+        if("yes".equals(deleteNoReceiveOrder)){
+            //查询该采购订单下所有未接收的运输订单（5,6,7,8,17,18)
+            ArrayList<Integer> orderIdList = backgroundProcessingMapper.getAllPurOrder(purchaseOrderNo);
+            if(orderIdList != null && orderIdList.size() != 0){
+                backgroundProcessingMapper.deleteOrders(orderIdList); //物理删除
+                backgroundProcessingMapper.deleteOrderMaterials(orderIdList);//物理删除物资子表
+                backgroundProcessingMapper.batchByOrderIdForTotalDelete(orderIdList);//总实绩表
+            }
+        }
         if(i != 1){
             return failed("关闭失败！没有此采购订单");
         }

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

@@ -286,6 +286,39 @@ public class OMSController {
                                                     ) {
         return omsFeign.selectAllOrderForSale(mapValue==null?new HashMap<>():mapValue, carrierId, apiId, pageNum, pageSize, orderType, orderStatus, saleOrderMaterialId, con);
     }
+    /**
+     * 展示承运商接收销售公司已接受的销售订单
+     *
+     * @param
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping("/getTransportOrder")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId", value = "168", required = false, dataType = "BigDecimal"),
+    })
+    public Map<String, Object> getTransportOrder( @RequestBody(required = false) Map<String, Object> mapValue,
+                                                  Integer apiId,
+                                                  Integer pageNum,
+                                                  Integer pageSize,
+                                                   Integer orderId,
+                                                  Integer orderStatus
+    ) {
+        if (mapValue==null){
+            mapValue=new HashMap<>();
+        }
+        return omsFeign.getTransportOrder(mapValue,apiId,pageNum,pageSize,orderId,orderStatus);
+    }
+
+
+
+
+
+
+
+
     /**
      * 销售物流：司机接单pc端
      */
@@ -298,7 +331,7 @@ public class OMSController {
             @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
     })
     @PostMapping("/getDriverInfoForSale")
-    public Map<String,Object> getDriverInfoForSale(@RequestBody(required=false) Map<String,Object> mapValue,
+    public Map<String,Object> getDriverInfoForSale(@RequestBody(required = false) Map<String, Object> mapValue,
                                                    Integer apiId,
                                                    Integer pageNum,
                                                    Integer pageSize,
@@ -307,10 +340,9 @@ public class OMSController {
                                                    String con,
                                                    String carrierSsoId,
                                                    Integer shipperId
-
     )
     {
-        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,orderType,orderStatus, con,carrierSsoId,shipperId);
     }
     @PostMapping("/getDriverInfoForSale1")
     public Map<String,Object> getDriverInfoForSale1(@RequestBody(required=false) Map<String,Object> mapValue,
@@ -840,4 +872,18 @@ public class OMSController {
     public Map<String, Object> updateMaterialMes(@RequestBody(required = false) Map<String, Object> map) {
         return omsFeign.updateMaterialMes(map);
     }
+
+    @ApiOperation(value = "展示销售订单下的运输订单")
+    @PostMapping("getDriverInfoForSale2")
+    public Map<String, Object> getDriverInfoForSale2(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                     Integer apiId,
+                                                     Integer pageNum,
+                                                     Integer pageSize,
+                                                     Integer saleOrderId,
+                                                     String con) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return omsFeign.getDriverInfoForSale2(mapValue,apiId,pageNum,pageSize,new BigDecimal(saleOrderId),con);
+    }
 }

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

@@ -213,6 +213,29 @@ public class OTMSController {
     public RESTfulResult getCurrentLocation(@RequestParam("capcityNumber") String capcityNumber) throws Exception{
         return otmsFeign.getCurrentLocation(capcityNumber);
     }
+    //获取地图顶点
+    @GetMapping(value = "/mapvertexs/findAllAvailableVertex")
+    public RESTfulResult findAllAvailableVertex(){
+        return  otmsFeign.findAllAvailableVertex();
+    }
+
+    //获取最佳路径
+    @GetMapping(value = "/mapvertexs/getObtainTheOptimalPath")
+    public RESTfulResult getObtainTheOptimalPath(@RequestParam("startPoint") String startPoint,@RequestParam("endPoint")  String endPoint) throws Exception{
+        return otmsFeign.getObtainTheOptimalPath(startPoint,endPoint);
+    }
+
+    @ApiOperation(value="获取当前订单导航路径")
+    @GetMapping(value = "/mapvertexs/getPathByOrderID")
+    public RESTfulResult getPathByOrderID(@RequestParam("orderId") String orderId,@RequestParam("startStep")  String startStep,@RequestParam("endStep")  String endStep) throws  Exception {
+       return otmsFeign.getPathByOrderID(orderId,startStep,endStep);
+    }
+
+    @ApiOperation(value="查询所有可选地点")
+    @GetMapping(value = "/mapvertexs/findSelections")
+    public RESTfulResult findSelections(){
+        return otmsFeign.findSelections();
+    }
 
     //在途订单列表
     @PostMapping("/transportationPerformance")
@@ -222,5 +245,4 @@ public class OTMSController {
                                                    @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/RMScontroller.java

@@ -1107,6 +1107,22 @@ public class RMScontroller {
         return rmsFeign.deleteCapacityCarrier(map!=null?map:new HashMap<>());
     }
 
+    @ApiOperation("罗棒的")
+    @PostMapping("/getInwardContractMaterial")
+    public RESTfulResult getInwardContractMaterial(@RequestBody(required = false) Map<String,Object> map,
+                                                   Integer apiId,
+                                                   Integer pageNum,
+                                                   Integer pageSize,
+                                                   String con){
+        return rmsFeign.getInwardContractMaterial(map!=null?map:new HashMap<>(),apiId,pageNum,pageSize,con);
+    }
+
+    @ApiOperation("罗棒的")
+    @PostMapping("/insertMaterialType")
+    public RESTfulResult insertMaterialType(@RequestBody(required = false) Map<String,Object> map) {
+        return rmsFeign.insertMaterialType(map);
+    }
+
     @ApiOperation("渲染运力修改数据")
     @PostMapping("/getCapacityInfoById/{id}")
     public Map<String, Object> getCapacityInfoById(@PathVariable("id") Integer id){

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

@@ -1281,21 +1281,6 @@ public class TMSController extends BaseRESTfulController {
         String orderNumber = (String) mapValue.get("orderNumber");
         orderNumber = orderNumber.substring(0, orderNumber.length()-1);
         mapValue.put("orderNumber", orderNumber);
-        //通过订单号获取订单ID 和 订单类型
-        Map<String, Object> orderMesMap = universalMapper.getOrderMesByOrderNumber(orderNumber);
-        BigDecimal orderType = DataChange.dataToBigDecimal(orderMesMap.get("orderType"));
-        //如果订单类型为2 则需要财务公司审核才能进厂
-        if(orderType.intValue() == 2){
-            Integer saleOrderStatus = universalMapper.getSaleOrderStatus(DataChange.dataToBigDecimal(orderMesMap.get("orderId")));
-            if(saleOrderStatus != 4){
-                //如果不等于4则是未通过财务审批 ，不可以进厂
-                Map<String, Object> returnMap = new HashMap<>();
-                returnMap.put("code", "201");
-                returnMap.put("status", "failed");
-                returnMap.put("data", "审批未通过不能进厂！");
-                return returnMap;
-            }
-        }
         return tmsTruckFeign.enFactoryResultByPDA(mapValue);
     }
 
@@ -1967,9 +1952,10 @@ public class TMSController extends BaseRESTfulController {
                                           String carrierSsoId,
                                                 Integer orderType,
                                                 Integer shipperId,
-                                                String receiveName
+                                                String receiveName,
+                                                String materialName
     ){
-        return tmsTruckFeign.getAllSaleReport(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime, carrierSsoId,orderType,shipperId,receiveName);
+        return tmsTruckFeign.getAllSaleReport(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime, carrierSsoId,orderType,shipperId,receiveName,materialName);
     }
 
     @ApiOperation(value="查询销售统计报表筛选过后的总净重")
@@ -2046,6 +2032,83 @@ public class TMSController extends BaseRESTfulController {
     }
 
 
+    @ApiOperation(value="获取内转报表")
+    @PostMapping("/getPurchaseInwardList")
+    public Map<String, Object> getPurchaseInwardList(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                        Integer apiId,
+                                                        Integer pageNum,
+                                                        Integer pageSize,
+                                                        String startTime,
+                                                        String endTime,
+                                                        String orgCode,
+                                                        String isPage,
+                                                        String index) {
+        if (mapValue==null){
+            mapValue=new HashMap<>();
+        }
+        return tmsTruckFeign.getPurchaseInwardList(mapValue,apiId,pageNum,pageSize,startTime,endTime,orgCode,isPage,index);
+    }
+
+
+
+
+
+    @ApiOperation(value="获取采购订单报表")
+    @PostMapping("/getPurchaseOrderList")
+    public Map<String, Object> getPurchaseOrderList(@RequestBody(required=false) Map<String,Object> mapValue,
+                                             Integer apiId,
+                                             Integer pageNum,
+                                             Integer pageSize,
+                                             String startTime,
+                                             String endTime,
+                                             String orgCode,
+                                                    String isPage,
+                                                    String index) {
+        if (mapValue==null){
+            mapValue=new HashMap<>();
+        }
+        return tmsTruckFeign.getPurchaseOrderList(mapValue,apiId,pageNum,pageSize,startTime,endTime,orgCode,isPage,index);
+    }
+
+
+
+    @ApiOperation(value="获取采购订单报表")
+    @PostMapping("/getInwardInFactory")
+    public Map<String, Object> getInwardInFactory(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                    Integer apiId,
+                                                    Integer pageNum,
+                                                    Integer pageSize,
+                                                    String startTime,
+                                                    String endTime,
+                                                    String orgCode,
+                                                    String isPage,
+                                                  String index) {
+        if (mapValue==null){
+            mapValue=new HashMap<>();
+        }
+        return tmsTruckFeign.getInwardInFactory(mapValue,apiId,pageNum,pageSize,startTime,endTime,orgCode,isPage,index);
+    }
+
+
+
+    @ApiOperation(value="获取销售订单列表")
+    @PostMapping("/getSaleOrderList")
+    public Map<String, Object> getSaleOrderList(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                    Integer apiId,
+                                                    Integer pageNum,
+                                                    Integer pageSize,
+                                                    String startTime,
+                                                    String endTime,
+                                                    String orgCode,
+                                                    String isPage,
+                                                   String index) {
+        if (mapValue==null){
+            mapValue=new HashMap<>();
+        }
+        return tmsTruckFeign.getSaleOrderList(mapValue,apiId,pageNum,pageSize,startTime,endTime,orgCode,isPage,index);
+    }
+
+
     @PostMapping("/sendMeasureCommission")
     public Map<String, Object> sendMeasureCommission(@RequestBody(required = false) Map<String, Object> map){
         return  tmsTruckFeign.sendMeasureCommission(map);
@@ -2166,8 +2229,9 @@ public class TMSController extends BaseRESTfulController {
                                                   Integer pageSize,
                                                   String startTime,
                                                   String endTime,
-                                                  String con){
-        return tmsTruckFeign.getCapacityByDefend(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize,startTime,endTime,con);
+                                                  String con,
+                                                  String yes){
+        return tmsTruckFeign.getCapacityByDefend(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize,startTime,endTime,con,yes);
     }
 
     @ApiOperation("厂外抵达作业")

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

@@ -1191,7 +1191,8 @@ public interface AmsFeign {
                                    @RequestParam Integer pageSize,
                                    @RequestParam Integer apiId,
                                    @RequestParam Integer requirementStatus,
-                                   @RequestParam String orgCode);
+                                   @RequestParam String orgCode,
+                                                @RequestParam String index);
 
     @ApiOperation(value="查询app端公开抢单")
     @PostMapping(value = "/api/v1/ams/amsdispatchsaleorders/getDispatchSaleOrderList")
@@ -1655,4 +1656,20 @@ public interface AmsFeign {
     // 自动匹配上一条运单的司机电话
     @PostMapping(value = "/api/v1/ams/amssaleorders/matchingDriverTelRecently")
     RESTfulResult matchingDriverTelRecently(@RequestParam String capacityNumber);
+
+    // 展示副产品销售订单列表
+    @PostMapping(value = "/api/v1/ams/amssaleorders/getFuSaleOrderList")
+    Map<String, Object> getFuSaleOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                           @RequestParam Integer pageNum,
+                                           @RequestParam Integer pageSize,
+                                           @RequestParam Integer apiId,
+                                           @RequestParam String con);
+
+    // 展示副产品销售订单列表
+    @PostMapping(value = "/api/v1/ams/amssaleorders/updateAllMaterialInSale")
+    RESTfulResult updateAllMaterialInSale(@RequestBody Map<String, Object> mapValue);
+
+    // 同步关闭金蝶订单
+    @PostMapping(value = "/api/v1/ams/amssaleorders/deleteSaleOrderSame")
+    Map<String,Object> deleteSaleOrderSame(@RequestBody Map<String, Object> mapValue);
 }

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

@@ -245,4 +245,20 @@ public interface BmstruckFeign {
                                                     @RequestParam("userId") String userId,
                                                     @RequestParam("startTime")String startTime,
                                                     @RequestParam("endTime")String endTime);
-}
+
+
+
+    @PostMapping(value = "/api/v1/bmstruck/bmstruckdetailsorder/getInwardWeightTimeDetailsOrder")
+    Map<String, Object> getInwardWeightTimeDetailsOrder(@RequestBody(required = false)Map<String, Object> mapVal,
+                                                        @RequestParam("pageNum") Integer pageNum,
+                                                        @RequestParam("pageSize") Integer pageSize,
+                                                        @RequestParam("apiId") Integer apiId,
+                                                        @RequestParam("carrierSsoId") String carrierSsoId,
+                                                        @RequestParam("detailStatus") Integer detailStatus,
+                                                        @RequestParam("orderType") Integer orderType,
+                                                        @RequestParam("userId") String userId,
+                                                        @RequestParam("startTime")String startTime,
+                                                        @RequestParam("endTime")String endTime);
+}
+
+

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

@@ -130,15 +130,15 @@ public interface OmsFeign {
      * 销售物流司机接收新的订单
      */
     @PostMapping(value = "api/v1/oms/omstruckorders/getDriverInfoForSale")
-    Map<String,Object> getDriverInfoForSale(@RequestBody(required=false) Map<String,Object> mapValue,
-                                            @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
+    Map<String,Object> getDriverInfoForSale(@RequestBody(required = false) Map<String, Object> mapValue,
+                                            @RequestParam Integer apiId,
+                                            @RequestParam Integer pageNum,
+                                            @RequestParam Integer pageSize,
+                                            @RequestParam Integer orderType,
+                                            @RequestParam Integer orderStatus,
+                                            @RequestParam String con,
+                                            @RequestParam String carrierSsoId,
+                                            @RequestParam Integer shipperId
     );
 
 
@@ -496,5 +496,20 @@ public interface OmsFeign {
     @PostMapping("api/v1/oms/omstruckmatetialorders/updateMaterialMes")
     public Map<String, Object> updateMaterialMes(@RequestBody(required = false) Map<String, Object> map);
 
+    @PostMapping("api/v1/oms/omstruckorders/getDriverInfoForSale2")
+    Map<String, Object> getDriverInfoForSale2(@RequestBody(required = false) Map<String, Object> mapValue,
+                                              @RequestParam Integer apiId,
+                                              @RequestParam Integer pageNum,
+                                              @RequestParam Integer pageSize,
+                                              @RequestParam BigDecimal saleOrderId,
+                                              @RequestParam String con);
+
+    @PostMapping("api/v1/oms/omstruckorders/getTransportOrder")
+    Map<String, Object> getTransportOrder(@RequestBody(required = false) Map<String, Object> mapValue,
+                                          @RequestParam("apiId") Integer apiId,
+                                          @RequestParam("pageNum") Integer pageNum,
+                                          @RequestParam("pageSize") Integer pageSize,
+                                          @RequestParam("orderId") Integer orderId,
+                                          @RequestParam("orderStatus") Integer orderStatus);
 }
 

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

@@ -7,8 +7,8 @@ import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.util.HashMap;
-import java.util.Map;
+import java.util.*;
+
 @FeignClient(value = "DAL-OTMS-API-DEV", url = "${openfeign.OTMSFeign.url}")
 public interface OtmsFeign {
     //在途订单列表
@@ -115,10 +115,28 @@ public interface OtmsFeign {
     @GetMapping("/api/v1/otms/pathDisplay/getCurrentLocation")
     public RESTfulResult getCurrentLocation(@RequestParam("capcityNumber") String capcityNumber) throws Exception;
 
+    //获取地图顶点
+    @GetMapping(value = "/api/v1/otms/mapvertexs/findAllAvailableVertex")
+    public RESTfulResult findAllAvailableVertex();
+
+    //获取最佳路径
+    @GetMapping(value = "/api/v1/otms/mapvertexs/getObtainTheOptimalPath")
+    public RESTfulResult getObtainTheOptimalPath(@RequestParam("startPoint") String startPoint,@RequestParam("endPoint")  String endPoint) throws Exception;
+
+    //获取当前订单导航路径
+    @GetMapping(value = "/api/v1/otms/mapvertexs/getPathByOrderID")
+    public RESTfulResult getPathByOrderID(@RequestParam("orderId") String orderId,@RequestParam("startStep")  String startStep,@RequestParam("endStep")  String endStep) throws Exception;
+
+    //获取导航可选地点
+    @GetMapping(value = "/api/v1/otms/mapvertexs/findSelections")
+    public RESTfulResult findSelections();
+
     @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/RmsFeign.java

@@ -606,6 +606,16 @@ public interface RmsFeign {
     @PostMapping("api/v1/rms/rmscapacity/deleteCapacityCarrier")
     public RESTfulResult deleteCapacityCarrier(@RequestBody(required = false) Map<String,Object> map);
 
+    @PostMapping("api/v1/rms/rmsmaterialtype/getInwardContractMaterial")
+    RESTfulResult getInwardContractMaterial(@RequestBody(required = false) Map<String, Object> map,
+                                            @RequestParam Integer apiId,
+                                            @RequestParam Integer pageNum,
+                                            @RequestParam Integer pageSize,
+                                            @RequestParam String con);
+
+    @PostMapping("api/v1/rms/rmsmaterialtype/insertMaterialType")
+    RESTfulResult insertMaterialType(@RequestBody(required = false) Map<String, Object> map);
+
     @PostMapping("api/v1/rms/rmscapacity/getCapacityInfoById/{id}")
     Map<String,Object> getCapacityInfoById(@PathVariable("id") Integer id);
 

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

@@ -394,7 +394,8 @@ public interface TmsTruckFeign {
                                       @RequestParam("carrierSsoId")   String carrierSsoId,
                                          @RequestParam("orderType") Integer orderType,
                                          @RequestParam("shipperId") Integer shipperId,
-                                         @RequestParam("receiveName") String receiveName
+                                         @RequestParam("receiveName") String receiveName,
+                                         @RequestParam String materialName
     );
 
     @PostMapping("api/v1/truckTms/statisticalReport/getAllSaleReportTotal")
@@ -543,7 +544,8 @@ public interface TmsTruckFeign {
                                           @RequestParam Integer pageSize,
                                             @RequestParam String startTime,
                                             @RequestParam String endTime,
-                                          @RequestParam String con
+                                          @RequestParam String con,
+                                            @RequestParam String yes
                                          );
 
     @PostMapping("api/v1/truckTms/tmstruckreceiptresults/getReceiptResult")
@@ -626,6 +628,52 @@ public interface TmsTruckFeign {
     @ApiOperation(value = "获取收货作业照片")
     @PostMapping("/api/v1/truckTms/tmstruckreceiptresults/getReceivingPhotoByUrl")
     public Map<String,Object> getReceivingPhotoByUrl(@RequestParam String orderNumber);
+
+
+
+    @PostMapping("/api/v1/truckTms/statisticalReport/getPurchaseInwardList")
+    Map<String, Object> getPurchaseInwardList(@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("orgCode") String orgCode,
+                                      @RequestParam("isPage") String isPage,
+                                      @RequestParam("index") String index);
+
+    @PostMapping("/api/v1/truckTms/statisticalReport/getPurchaseOrderList")
+    Map<String, Object> getPurchaseOrderList(@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("orgCode") String orgCode,
+                                              @RequestParam("isPage") String isPage,
+                                             @RequestParam("index") String index);
+
+    @PostMapping("/api/v1/truckTms/statisticalReport/getSaleOrderList")
+    Map<String, Object> getSaleOrderList(@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("orgCode") String orgCode,
+                                         @RequestParam("isPage") String isPage,
+                                         @RequestParam("index") String index);
+
+    @PostMapping("/api/v1/truckTms/statisticalReport/getInwardInFactory")
+    Map<String, Object> getInwardInFactory(@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("orgCode") String orgCode,
+                                           @RequestParam("isPage") String isPage,
+                                           @RequestParam("index") String index);
 }
 
 

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

@@ -1,8 +1,11 @@
 package com.steerinfo.dil.mapper;
 
+import org.apache.ibatis.annotations.Param;
 import org.mapstruct.Mapper;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 
 @Mapper
@@ -16,5 +19,38 @@ public interface BackgroundProcessingMapper {
 
     Map<String, Object> getOrderMesByOrderNum(String orderNumber);
 
-    Map<String, Object> getEnFactoryResult(BigDecimal resultTotalId);
+    ArrayList<Integer> getAllPurOrder(String purchaseOrderNo);
+
+    int deleteOrders(ArrayList<Integer> list);
+
+    int deleteOrderMaterials(ArrayList<Integer> list);
+
+    int batchByOrderIdForTotalDelete(ArrayList<Integer> list);
+
+    List<Integer> enFactoryCheck(BigDecimal resultTotalId);
+    List<Integer> loadCheck(BigDecimal resultTotalId);
+    List<Integer> unloadCheck(BigDecimal resultTotalId);
+    List<Integer> weightCheck(BigDecimal resultTotalId);
+    List<Integer> outFactoryCheck(BigDecimal resultTotalId);
+
+    List<Map<String, Object>> getEnFactoryResult(@Param("resultTotalId") BigDecimal resultTotalId,@Param("sqe") Integer sqe);
+
+    List<Map<String, Object>> loadResult(@Param("resultTotalId") BigDecimal resultTotalId,@Param("sqe") Integer sqe);
+
+    List<Map<String, Object>> unloadResult(@Param("resultTotalId") BigDecimal resultTotalId,@Param("sqe") Integer sqe);
+
+    List<Map<String, Object>> weightResult(@Param("resultTotalId") BigDecimal resultTotalId,@Param("sqe") Integer sqe);
+
+    List<Map<String, Object>> outFactoryResult(@Param("resultTotalId") BigDecimal resultTotalId,@Param("sqe") Integer sqe);
+
+    int deleteEnFactoryUnnecessaryResult(@Param("list") List<Integer> list);
+
+    int deleteLoadUnnecessaryResult(@Param("list") List<Integer> list);
+
+    int deleteUnloadUnnecessaryResult(@Param("list") List<Integer> list);
+
+    int deleteWeightUnnecessaryResult(@Param("list") List<Integer> list);
+
+    int deleteOutFactoryUnnecessaryResult(@Param("list") List<Integer> list);
+
 }

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

@@ -1,7 +1,6 @@
 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;
@@ -43,7 +42,74 @@ public class BackgroundProcessingServiceImpl implements IBackgroundProcessServic
             return 0;
         }
         BigDecimal resultTotalId = DataChange.dataToBigDecimal(orderMes.get("resultTotalId"));
-
+        List<Integer> enFactoryList = backgroundProcessingMapper.enFactoryCheck(resultTotalId);
+        if(enFactoryList != null && enFactoryList.size() != 0){
+            //查询出当前顺序号中所有的实绩
+            for (Integer sqe : enFactoryList) {
+                List<Map<String, Object>> mesList = backgroundProcessingMapper.getEnFactoryResult(resultTotalId, sqe);
+                closeWay(mesList, 1);
+            }
+        }
+        List<Integer> loadList = backgroundProcessingMapper.loadCheck(resultTotalId);
+        if(loadList != null && loadList.size() != 0){
+            for (Integer sqe : loadList) {
+                List<Map<String, Object>> mesList = backgroundProcessingMapper.loadResult(resultTotalId, sqe);
+                closeWay(mesList, 2);
+            }
+        }
+        List<Integer> unloadList = backgroundProcessingMapper.unloadCheck(resultTotalId);
+        if(unloadList != null && unloadList.size() != 0){
+            for (Integer sqe : unloadList) {
+                List<Map<String, Object>> mesList = backgroundProcessingMapper.unloadResult(resultTotalId, sqe);
+                closeWay( mesList, 3);
+            }
+        }
+        List<Integer> weightList = backgroundProcessingMapper.weightCheck(resultTotalId);
+        if(weightList != null && weightList.size() != 0){
+            for (Integer sqe : weightList) {
+                List<Map<String, Object>> mesList = backgroundProcessingMapper.weightResult(resultTotalId, sqe);
+                closeWay(mesList, 4);
+            }
+        }
+        List<Integer> outFactoryList = backgroundProcessingMapper.outFactoryCheck(resultTotalId);
+        if(outFactoryList != null && outFactoryList.size() != 0){
+            for (Integer sqe : outFactoryList) {
+                List<Map<String, Object>> mesList = backgroundProcessingMapper.outFactoryResult(resultTotalId, sqe);
+                closeWay(mesList, 5);
+            }
+        }
         return 0;
     }
+
+    /**
+     * 关闭通用方法
+     * @param mesList 这些顺序号的实绩信息
+     * @param type 1：进厂 2：计量 3：装货：4：卸货 5：出厂
+     */
+    public void closeWay(List<Map<String, Object>> mesList, int type){
+        List<Integer> resultList = new ArrayList<>();
+        for (Map<String, Object> map : mesList) {
+            //有过操作时间的不做删除
+            if(map.get("time") == null){
+                resultList.add(DataChange.dataToBigDecimal(map.get("resultId")).intValue()); //添入列表中
+            }
+        }
+        if(mesList.size() == resultList.size()){
+            //如果所有的实绩都为空 ，则只保留一条实绩，其余的全部删除
+            resultList.remove(0);
+        }
+        if(resultList.size() != 0){
+            //删除实绩数据
+            if(type == 1)
+                backgroundProcessingMapper.deleteEnFactoryUnnecessaryResult(resultList);
+            else if(type == 2)
+                backgroundProcessingMapper.deleteLoadUnnecessaryResult(resultList);
+            else if(type == 3)
+                backgroundProcessingMapper.deleteUnloadUnnecessaryResult(resultList);
+            else if(type == 4)
+                backgroundProcessingMapper.deleteWeightUnnecessaryResult(resultList);
+            else if(type == 5)
+                backgroundProcessingMapper.deleteOutFactoryUnnecessaryResult(resultList);
+        }
+    }
 }

src/main/resources/application-dev.yml

@@ -23,7 +23,7 @@ openfeign:
     url: ${TMSTRAINFEIGN_URL:172.16.33.162:8004}
   TmsTruckFeign:
     url: ${TMSTRUCKFEIGN_URL:172.16.33.162:8008}
-    #url: ${TMSTRUCKFEIGN_URL:172.16.33.162:8088}
+    #url: ${TMSTRUCKFEIGN_URL:localhost:8088}
   TmsshipFeign:
     url: ${TMSSHIPFEIGN_URL:172.16.33.162:8003}
   WMSHFeign:
@@ -38,7 +38,7 @@ openfeign:
     url: ${JOINFEIGN_URL:172.16.33.162:8006}
   OTMSFeign:
     url: ${OTMSFEIGN_URL:172.16.33.162:8038}
-    #url: ${OTMSFEIGN_URL:localhost:8038}
+
 piction:
   #path: C:\Users\24390\Desktop\work\a
   #path: D:\Code\work\jpg

src/main/resources/bootstrap.yml

@@ -1,7 +1,6 @@
 api.version: api/v1
 spring:
   profiles:
-    #include: ${SPRING_PROFILES:dev}
     include: ${SPRING_PROFILES:prod}
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss

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

@@ -30,9 +30,167 @@
 
     <select id="getEnFactoryResult" resultType="java.util.Map">
         select TER.RESULT_ID    "resultId",
-               TER.SEGMEN_SQE   "segmentSqe",
-               TER.RESULT_ENTRY_GATE_TIME   "resultEntryGateTime"
+               TER.RESULT_ENTRY_GATE_TIME   "time"
         from TMSTRUCK_ENFACTORY_RESULT TER
         where TER.RESULT_TOTAL_ID = #{resultTotalId}
+          and  TER.SEGMEN_SQE = #{sqe}
     </select>
+
+    <select id="loadResult" resultType="java.util.Map">
+        select T.RESULT_ID    "resultId",
+               T.RESULT_LOAD_END_TIME   "time"
+        from TMSTRUCK_LOAD_RESULT T
+        where T.RESULT_TOTAL_ID = #{resultTotalId}
+          and  T.SEGMENT_SQE = #{sqe}
+    </select>
+
+    <select id="unloadResult" resultType="java.util.Map">
+        select T.RESULT_ID    "resultId",
+               T.RESULT_END_TIME   "time"
+        from TMSTRUCK_UNLOAD_RESULT T
+        where T.RESULT_TOTAL_ID = #{resultTotalId}
+          and  T.SEGMENT_SQE = #{sqe}
+    </select>
+
+    <select id="weightResult" resultType="java.util.Map">
+        select T.WEIGHT_TASK_RESULT_ID    "resultId",
+               T.RESULT_TARE_WEIGHT_TIME   "time"
+        from TMSTRUCK_WEIGHT_RESULT T
+        where T.RESULT_TOTAL_ID = #{resultTotalId}
+          and  T.GROSS_SEGMENT_SQE = #{sqe}
+    </select>
+
+    <select id="outFactoryResult" resultType="java.util.Map">
+        select T.RESULT_ID    "resultId",
+               T.RESULT_OUT_GATE_TIME   "time"
+        from TMSTRUCK_LEAVE_FACTORY_RESULT T
+        where T.RESULT_TOTAL_ID = #{resultTotalId}
+          and  T.SEGMENT_SQE = #{sqe}
+    </select>
+
+    <select id="getAllPurOrder" resultType="java.lang.Integer">
+        select OO.ORDER_ID
+        from OMSTRUCK_ORDER OO
+        left join AMS_PURCHASE_ORDER APO
+            on OO.ORDER_PLAN_ID = APO.PURCHASE_ORDER_ID
+        where APO.PURCHASE_ORDER_NO = #{purchaseOrderNo}
+          and OO.ORDER_TYPE in (5,6,7,8,17,18)
+          and OO.ORDER_STATUS in (3,4)
+    </select>
+
+    <delete id="deleteOrders" parameterType="arraylist">
+        delete
+        from OMSTRUCK_ORDER OO
+        where OO.ORDER_ID in
+        <foreach collection="list" item="id" open="(" separator="," close=")" >
+            ${id}
+        </foreach>
+    </delete>
+
+    <delete id="deleteOrderMaterials" parameterType="arraylist">
+        delete
+        from OMSTRUCK_ORDER_MATERIAL OOM
+        where OOM.ORDER_ID in
+        <foreach collection="list" item="id" open="(" separator="," close=")" >
+            ${id}
+        </foreach>
+    </delete>
+
+    <delete id="batchByOrderIdForTotalDelete" parameterType="arraylist">
+        delete from TMSTRUCK_TOTAL_RESULT TTR
+        where TTR.ORDER_ID in
+        <foreach collection="list" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </delete>
+
+    <select id="enFactoryCheck" parameterType="decimal" resultType="int">
+        SELECT
+            TER.SEGMEN_SQE  "segmentSqe"
+        FROM
+            TMSTRUCK_ENFACTORY_RESULT TER
+        WHERE
+            TER.RESULT_TOTAL_ID = #{resultTotalId}
+        GROUP BY TER.SEGMEN_SQE
+        HAVING count( TER.SEGMEN_SQE ) > 1
+    </select>
+
+    <select id="loadCheck" parameterType="decimal" resultType="int">
+        SELECT
+            T.SEGMENT_SQE  "segmentSqe"
+        FROM
+            TMSTRUCK_LOAD_RESULT T
+        WHERE
+            T.RESULT_TOTAL_ID = #{resultTotalId}
+        GROUP BY T.SEGMENT_SQE
+        HAVING count( T.SEGMENT_SQE ) > 1
+    </select>
+
+    <select id="unloadCheck" parameterType="decimal" resultType="int">
+        SELECT
+            T.SEGMENT_SQE  "segmentSqe"
+        FROM
+            TMSTRUCK_UNLOAD_RESULT T
+        WHERE
+            T.RESULT_TOTAL_ID = #{resultTotalId}
+        GROUP BY T.SEGMENT_SQE
+        HAVING count( T.SEGMENT_SQE ) > 1
+    </select>
+
+    <select id="weightCheck" parameterType="decimal" resultType="int">
+        SELECT
+            T.GROSS_SEGMENT_SQE   "segmentSqe"
+        FROM
+            TMSTRUCK_WEIGHT_RESULT T
+        WHERE
+            T.RESULT_TOTAL_ID = #{resultTotalId}
+        GROUP BY T.GROSS_SEGMENT_SQE
+        HAVING count( T.GROSS_SEGMENT_SQE  ) > 1
+    </select>
+
+    <select id="outFactoryCheck" parameterType="decimal" resultType="int">
+        SELECT
+            T.SEGMENT_SQE  "segmentSqe"
+        FROM
+            TMSTRUCK_LEAVE_FACTORY_RESULT T
+        WHERE
+            T.RESULT_TOTAL_ID = #{resultTotalId}
+        GROUP BY T.SEGMENT_SQE
+        HAVING count( T.SEGMENT_SQE ) > 1
+    </select>
+
+    <delete id="deleteEnFactoryUnnecessaryResult">
+        delete from TMSTRUCK_ENFACTORY_RESULT where RESULT_ID in
+        <foreach collection="list" item="id" open="(" separator="," close=")">
+            ${id}
+        </foreach>
+    </delete>
+
+  <delete id="deleteLoadUnnecessaryResult">
+        delete from TMSTRUCK_LOAD_RESULT where RESULT_ID in
+        <foreach collection="list" item="id" open="(" separator="," close=")">
+            ${id}
+        </foreach>
+    </delete>
+
+    <delete id="deleteUnloadUnnecessaryResult">
+        delete from TMSTRUCK_UNLOAD_RESULT where RESULT_ID in
+        <foreach collection="list" item="id" open="(" separator="," close=")">
+            ${id}
+        </foreach>
+    </delete>
+
+    <delete id="deleteWeightUnnecessaryResult">
+        delete from TMSTRUCK_WEIGHT_RESULT where WEIGHT_TASK_RESULT_ID in
+        <foreach collection="list" item="id" open="(" separator="," close=")">
+            ${id}
+        </foreach>
+    </delete>
+
+    <delete id="deleteOutFactoryUnnecessaryResult">
+        delete from TMSTRUCK_LEAVE_FACTORY_RESULT where RESULT_ID in
+        <foreach collection="list" item="id" open="(" separator="," close=")">
+            ${id}
+        </foreach>
+    </delete>
 </mapper>

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

@@ -168,7 +168,7 @@
                 and (instr(RC.CAPACITY_NUMBER, #{index}) > 0 or instr(RCA.CARRIER_NAME, #{index}) > 0 or  instr(RC.INSERT_UPDATE_REMARK, #{index})>0)
             </if>
             <if test="con != null">
-                and instr(RCA.INSERT_UPDATE_REMARK, #{con}) > 0
+                and instr(RCC.INSERT_UPDATE_REMARK, #{con}) > 0
             </if>
             <if test="indexText!=null">
                 and instr(RCC.CAPACITY_USER_DEP, #{indexText}) > 0