增加地图接口

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

@@ -1879,4 +1879,15 @@ 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);
+    }
 }

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

@@ -8,10 +8,13 @@ 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.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 /*
  * 后台处理程序
@@ -30,11 +33,32 @@ 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("关闭失败！没有此采购订单");
         }
         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

@@ -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,18 +331,28 @@ 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,
-                                            Integer apiId,
-                                            Integer pageNum,
-                                            Integer pageSize,
-                                            Integer orderType,
-                                            Integer orderStatus,
-                                            String con,
-                                            @RequestParam String carrierSsoId,
+    public Map<String,Object> getDriverInfoForSale(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                   Integer apiId,
+                                                   Integer pageNum,
+                                                   Integer pageSize,
+                                                   Integer orderType,
+                                                   Integer orderStatus,
+                                                   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,
+                                                   Integer orderStatus,
+                                                   String con,
+                                                   String numberPlate,
+                                                   @RequestParam Integer saleOrderId
+    )
+    {
+        return omsFeign.getDriverInfoForSale1(mapValue==null?new HashMap<>():mapValue,orderStatus, con,numberPlate,saleOrderId);
     }
 
 
@@ -829,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

@@ -214,6 +214,7 @@ public class OTMSController {
         return otmsFeign.getCurrentLocation(capcityNumber);
     }
 
+<<<<<<< HEAD
     //获取地图顶点
     @GetMapping(value = "/mapvertexs/findAllAvailableVertex")
     public RESTfulResult findAllAvailableVertex(){
@@ -228,4 +229,15 @@ public class OTMSController {
 
 
 
+=======
+    //在途订单列表
+    @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);
+    }
+
+>>>>>>> bbca852991e7e93de2d881fe866fef87ad72b0e2
 }

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

@@ -1106,4 +1106,26 @@ public class RMScontroller {
     public RESTfulResult deleteCapacityCarrier(@RequestBody(required = false) Map<String,Object> map){
         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){
+        return rmsFeign.getCapacityInfoById(id);
+    }
 }

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

@@ -1271,21 +1271,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);
     }
 
@@ -1956,9 +1941,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="查询销售统计报表筛选过后的总净重")
@@ -2022,6 +2008,69 @@ 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);
+    }
+
+
+    @ApiOperation(value="获取内转报表")
+    @PostMapping("/getInwardList")
+    public Map<String, Object> getInwardList(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                        Integer apiId,
+                                                        Integer pageNum,
+                                                        Integer pageSize,
+                                                        String startTime,
+                                                        String endTime,
+                                                        String orgCode) {
+        if (mapValue!=null){
+            mapValue=new HashMap<>();
+        }
+        return tmsTruckFeign.getInwardList(mapValue,apiId,pageNum,pageSize,startTime,endTime,orgCode);
+    }
+
+
+
+
+
+    @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) {
+        if (mapValue!=null){
+            mapValue=new HashMap<>();
+        }
+        return tmsTruckFeign.getPurchaseOrderList(mapValue,apiId,pageNum,pageSize,startTime,endTime,orgCode);
+    }
+
+
+
+    @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) {
+        if (mapValue!=null){
+            mapValue=new HashMap<>();
+        }
+        return tmsTruckFeign.getSaleOrderList(mapValue,apiId,pageNum,pageSize,startTime,endTime,orgCode);
+    }
 
 
     @PostMapping("/sendMeasureCommission")
@@ -2123,6 +2172,19 @@ public class TMSController extends BaseRESTfulController {
     }
 
 
+    @ApiOperation(value="拼装车内转统计报表")
+    @PostMapping("/getInwardReportForAssemble")
+    public Map<String, Object> getInwardReportForAssemble(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                 Integer apiId,
+                                                 Integer pageNum,
+                                                 Integer pageSize,
+                                                 String startTime,
+                                                 String endTime
+    ){
+        return tmsTruckFeign.getInwardReportForAssemble(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime);
+    }
+
+
     @ApiOperation("保卫部随机抽查车牌号")
     @PostMapping("/getCapacityByDefend")
     public Map<String,Object> getCapacityByDefend(@RequestBody(required = false) Map<String,Object> mapValue,

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

@@ -152,7 +152,8 @@ public class UniversalController extends BaseRESTfulController {
                                         Integer pageSize,
                                         String carrierSsoId,
                                         String index,
-                                        String con
+                                        String con,
+                                        String indexText
     ){
         if(mapValue == null){
             mapValue = new HashMap<>();
@@ -163,6 +164,10 @@ public class UniversalController extends BaseRESTfulController {
         if (con != null&& !con.equals("undefined")){
             mapValue.put("con",con);
         }
+        if (indexText != null&& !indexText.equals("undefined")){
+            mapValue.put("indexText",indexText);
+        }
+
         if (carrierSsoId != null && carrierSsoId.equals("undefined")) {
             carrierSsoId = null;
         }

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/AmsFeign.java

@@ -1655,4 +1655,12 @@ 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);
 }

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

@@ -130,15 +130,24 @@ 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,
+    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
+    );
+
+
+    @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("carrierSsoId")  String carrierSsoId,
-                                            @RequestParam("shipperId") Integer shipperId
+                                            @RequestParam("numberPlate")  String numberPlate,
+                                            @RequestParam("saleOrderId") Integer saleOrderId
     );
 
     /**
@@ -487,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

@@ -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,
@@ -108,6 +115,7 @@ public interface OtmsFeign {
     @GetMapping("/api/v1/otms/pathDisplay/getCurrentLocation")
     public RESTfulResult getCurrentLocation(@RequestParam("capcityNumber") String capcityNumber) throws Exception;
 
+<<<<<<< HEAD
     //获取地图顶点
     @GetMapping(value = "/api/v1/otms/mapvertexs/findAllAvailableVertex")
     public RESTfulResult findAllAvailableVertex();
@@ -115,4 +123,12 @@ public interface OtmsFeign {
     //获取最佳路径
     @GetMapping(value = "/api/v1/otms/mapvertexs/getObtainTheOptimalPath")
     public RESTfulResult getObtainTheOptimalPath(@RequestParam("startPoint") String startPoint,@RequestParam("endPoint")  String endPoint) 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;
+>>>>>>> bbca852991e7e93de2d881fe866fef87ad72b0e2
 }

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

@@ -605,4 +605,17 @@ public interface RmsFeign {
     @ApiOperation("解除承运商和车辆的绑定关系")
     @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

@@ -393,7 +393,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")
@@ -479,6 +480,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,
@@ -515,6 +527,15 @@ public interface TmsTruckFeign {
                                      @RequestParam String endTime);
 
 
+    @PostMapping("api/v1/truckTms/statisticalReport/getInwardReportForAssemble")
+    Map<String, Object> getInwardReportForAssemble(@RequestBody(required = false) Map<String, Object> mapValue,
+                                          @RequestParam Integer apiId,
+                                          @RequestParam Integer pageNum,
+                                          @RequestParam Integer pageSize,
+                                          @RequestParam String startTime,
+                                          @RequestParam String endTime);
+
+
     @PostMapping("api/v1/truckTms/statisticalReport/getCapacityByDefend")
     Map<String, Object> getCapacityByDefend(@RequestBody(required = false) Map<String, Object> mapValue,
                                           @RequestParam Integer apiId,
@@ -605,6 +626,35 @@ public interface TmsTruckFeign {
     @ApiOperation(value = "获取收货作业照片")
     @PostMapping("/api/v1/truckTms/tmstruckreceiptresults/getReceivingPhotoByUrl")
     public Map<String,Object> getReceivingPhotoByUrl(@RequestParam String orderNumber);
+
+
+
+    @PostMapping("/api/v1/truckTms/statisticalReport/getInwardList")
+    Map<String, Object> getInwardList(@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);
+
+    @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);
+
+    @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);
 }
 
 

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

@@ -1,7 +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
@@ -9,8 +13,44 @@ 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);
+
+    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/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

@@ -2,22 +2,114 @@ package com.steerinfo.dil.service.impl;
 
 import com.steerinfo.dil.mapper.BackgroundProcessingMapper;
 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;
+        }
+        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);
         }
-        return 1;
     }
 }

src/main/resources/application-dev.yml

@@ -10,7 +10,7 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   AmsFeign:
-    url: ${AMSFEIGN_URL:172.16.33.162:8015}
+    url: ${AMSFEIGN_URL:localhost:8015}
   BmsshipFeign:
     url: ${BMSSHIPFEIGN_URL:172.16.33.162:8007}
   BmstrainFeign:
@@ -23,7 +23,10 @@ openfeign:
     url: ${TMSTRAINFEIGN_URL:172.16.33.162:8004}
   TmsTruckFeign:
     url: ${TMSTRUCKFEIGN_URL:172.16.33.162:8008}
+<<<<<<< HEAD
     #url: ${TMSTRUCKFEIGN_URL:localhost:8088}
+=======
+>>>>>>> bbca852991e7e93de2d881fe866fef87ad72b0e2
   TmsshipFeign:
     url: ${TMSSHIPFEIGN_URL:172.16.33.162:8003}
   WMSHFeign:
@@ -33,15 +36,14 @@ openfeign:
   OMSFeign:
     url: ${OMSFEIGN_URL:172.16.33.162:8016}
   RmsFeign:
-    url: ${RMSFEIGN_HRL:172.16.33.162:8060}
+    url: ${RMSFEIGN_HRL:172.16.33.162:8014}
   JoinFeign:
     url: ${JOINFEIGN_URL:172.16.33.162:8006}
   OTMSFeign:
     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,188 @@
     </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.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

@@ -149,18 +149,18 @@
     <select id="getAllCapacityByCarrierLike" parameterType="java.util.Map" resultType="java.util.LinkedHashMap">
         SELECT *
         FROM (
-                 SELECT
-                        RC.CAPACITY_ID        "capacityId",
-                        RCC.CARRIER_ID         "carrierId",
-                        RC.CAPACITY_NUMBER     "capacityNumber",
-                        RCA.CARRIER_NAME       "carrierName",
-                        RC.INSERT_UPDATE_REMARK "remark"
-                 FROM RMS_CAPACITY_CARRIER RCC
-                            LEFT JOIN RMS_CAPACITY RC
-                     ON RCC.CAPACITY_ID = RC.CAPACITY_ID
-                          JOIN RMS_CARRIER RCA
-                                ON RCA.CARRIER_ID = RCC.CARRIER_ID
-                 WHERE RC.CAPACITY_SSO_ID is not NULL
+        SELECT
+        RC.CAPACITY_ID "capacityId",
+        RCC.CARRIER_ID "carrierId",
+        RCC.CAPACITY_CARRIER_ID,
+        RC.CAPACITY_NUMBER "capacityNumber",
+        RCA.CARRIER_NAME "carrierName",
+        RCC.INSERT_UPDATE_REMARK "remark"
+        FROM
+        RMS_CAPACITY_CARRIER RCC
+        LEFT JOIN RMS_CAPACITY RC ON RCC.CAPACITY_ID = RC.CAPACITY_ID
+        JOIN RMS_CARRIER RCA ON RCA.CARRIER_ID = RCC.CARRIER_ID
+        WHERE RC.CAPACITY_SSO_ID is not NULL
             <if test="carrierId != null" >
                 and RCC.CARRIER_ID = #{carrierId}
             </if>
@@ -168,7 +168,10 @@
                 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(RC.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
             </if>
         )
         <where>
@@ -691,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