rms修改

pom.xml

@@ -106,31 +106,6 @@
     </dependencies>
     <build>
         <plugins>
-<!--            &lt;!&ndash;             自动生成代码文件 &ndash;&gt;-->
-<!--            <plugin>-->
-<!--                <groupId>com.steerinfo</groupId>-->
-<!--                <artifactId>generator-maven-plugin</artifactId>-->
-<!--                <version>3.0</version>-->
-<!--                <configuration>-->
-<!--            <connUrl>jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri</connUrl>-->
-<!--            <user>dagang</user>-->
-<!--            <password>root123</password>-->
-<!--                    &lt;!&ndash;包名&ndash;&gt;-->
-<!--                    <targetPackage>com.steerinfo.dil</targetPackage>-->
-<!--                    <tables>-->
-<!--                        <table></table>-->
-<!--                    </tables>-->
-<!--                </configuration>-->
-<!--                <executions>-->
-<!--                    <execution>-->
-<!--                        <phase>compile</phase>-->
-<!--                        <goals>-->
-<!--                            <goal>steerinfo</goal>-->
-<!--                        </goals>-->
-<!--                    </execution>-->
-<!--                </executions>-->
-<!--            </plugin>-->
-
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>

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

@@ -1004,7 +1004,7 @@ public class AMScontroller{
                                                 Integer pageSize,
                                                 Integer apiId,
                                                 Integer planStatus,
-                                                Integer carrierId,
+                                                String carrierId,
                                                 Integer planId) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
@@ -1085,8 +1085,8 @@ public class AMScontroller{
 
     @ApiOperation(value="抢单/接收订单锁定")
     @PostMapping("/lockDispatchSaleOrder")
-    public Map<String, Object> lockDispatchSaleOrder(Integer dispatchId,Integer carrierId) {
-        return amsFeign.lockDispatchSaleOrder(dispatchId, carrierId);
+    public Map<String, Object> lockDispatchSaleOrder(Integer dispatchId,String carrierSsoId) {
+        return amsFeign.lockDispatchSaleOrder(dispatchId, carrierSsoId);
     }
 
     @ApiOperation(value="查询app端承运商已抢到的单")
@@ -1101,8 +1101,8 @@ public class AMScontroller{
                                                            Integer apiId,
                                                            Integer pageNum,
                                                            Integer pageSize,
-                                                           Integer carrierId){
-        return  amsFeign.selectDispatchSaleOrderList(mapValue==null ?new HashMap<>():mapValue, apiId, pageNum, pageSize,carrierId);
+                                                           String carrierSsoId){
+        return  amsFeign.selectDispatchSaleOrderList(mapValue==null ?new HashMap<>():mapValue, apiId, pageNum, pageSize,carrierSsoId);
     }
 
     //获取到站名称
@@ -1138,8 +1138,9 @@ public class AMScontroller{
                                                       Integer pageSize,
                                                       Integer apiId,
                                                       Integer dispatchType,
+                                                      @RequestParam String carrierSsoId,
                                                       String con) {
-        return amsFeign.getPCDispatchSaleOrderList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,dispatchType, con);
+        return amsFeign.getPCDispatchSaleOrderList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,dispatchType,carrierSsoId, con);
     }
 
     @ApiModelProperty(value = "展示批次信息")
@@ -1377,6 +1378,24 @@ public class AMScontroller{
         return amsFeign.issueTruckNo(mapList);
     }
 
+    @ApiOperation(value = "展示车序号下的物资详情")
+    @PostMapping("/getTruckNoMaterialList")
+    public RESTfulResult getTruckNoMaterialList(@RequestParam Integer saleOrderMaterialId) {
+        return amsFeign.getTruckNoMaterialList(saleOrderMaterialId);
+    }
+
+    @ApiOperation(value = "展示销售订单下的物资详情")
+    @PostMapping("/getSaleMaterialList")
+    public RESTfulResult getSaleMaterialList(@RequestParam Integer saleOrderId) {
+        return amsFeign.getSaleMaterialList(saleOrderId);
+    }
+
+    @ApiOperation(value = "展示销售派单物资信息")
+    @PostMapping("/getDispatchMaterialList")
+    public RESTfulResult getDispatchMaterialList(@RequestParam Integer dispatchId) {
+        return amsFeign.getDispatchMaterialList(dispatchId);
+    }
+
     @ApiOperation(value="销售新增定向派单且直接下发")
     @PostMapping("/addDispatchSaleOrder")
     public Map<String,Object> addDispatchSaleOrder(@RequestBody Map<String,Object> mapValue) {

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

@@ -20,13 +20,19 @@ public class DilVersionController {
     @Autowired
     DilVersionServiceImpl dilVersionService;
 
-    @ApiOperation(value = "查询版本号")
+    @ApiOperation(value = "查询APP版本号")
     @PostMapping("/checkVersion")
-    public String deleteTruckRailDayPlan() {
-        return dilVersionService.compareAppVersion();
+    public String getAppVersion() {
+        return dilVersionService.getAppVersion();
     }
 
-    @ApiOperation(value = "新增版本号")
+    @ApiOperation(value = "查询PDA版本号")
+    @PostMapping("/getPDAVersion")
+    public String getPDAVersion() {
+        return dilVersionService.getPDAVersion();
+    }
+
+    @ApiOperation(value = "新增APP版本号")
     @PostMapping("/addAppVersion/{version}")
     public String addAppVersion(@PathVariable("version") String version) {
         return dilVersionService.addAppVersion(version);

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

@@ -46,9 +46,9 @@ public class OMSController {
                                           Integer orderStatus,
                                           Integer planId,
                                           Integer orderType,
-                                          Integer fuelOrder, String con) {
+                                          Integer fuelOrder,String carrierSSOId,String con) {
         return omsFeign.getAllTruckOrder(mapValue == null? new HashMap<>() : mapValue, apiId, pageNum, pageSize,
-                orderStatus, planId, orderType, fuelOrder, con);
+                orderStatus, planId, orderType, fuelOrder,carrierSSOId, con);
     }
 
     @ApiOperation(value = "不适用表头返回数据")
@@ -155,8 +155,7 @@ public class OMSController {
                                                Integer pageSize,
                                                @PathVariable Integer orderReceiveStatus,
                                                Integer orderType,
-                                               Integer orderStatus,
-                                                     String con
+                                               Integer orderStatus, String con
     ){
         return omsFeign.getReceiveRefuseOrder(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum,
                 pageSize, orderReceiveStatus, orderType, orderStatus, con);
@@ -218,9 +217,9 @@ public class OMSController {
                                               Integer pageNum,
                                               Integer pageSize,
                                               Integer orderType,
-                                              Integer orderStatus, Integer fuelOrder,String con){
+                                              Integer orderStatus, Integer fuelOrder,String carrierSSOId,String con){
         return omsFeign.getTransportDispatch(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize,
-                 orderType, orderStatus, fuelOrder, con);
+                 orderType, orderStatus, fuelOrder,carrierSSOId,con);
     }
 
     /**
@@ -291,10 +290,10 @@ public class OMSController {
                                             Integer orderType,
                                             Integer orderStatus,
                                             String con,
-                                            Integer carrierId
+                                            @RequestParam String carrierSsoId
     )
     {
-        return omsFeign.getDriverInfoForSale(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, orderType, orderStatus, con,carrierId);
+        return omsFeign.getDriverInfoForSale(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, orderType, orderStatus, con,carrierSsoId);
     }
 
 
@@ -516,11 +515,12 @@ public class OMSController {
                                                         Integer apiId,
                                                         Integer pageNum,
                                                         Integer pageSize,
-                                                        String con) {
+                                                        String con,
+                                                        String carrierId) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        Map<String, Object> map = omsFeign.getCapacityAndDriverList(mapValue, apiId, pageNum, pageSize, con);
+        Map<String, Object> map = omsFeign.getCapacityAndDriverList(mapValue, apiId, pageNum, pageSize, con,carrierId);
         return map;
     }
 
@@ -562,7 +562,7 @@ public class OMSController {
                                                   Integer pageNum,
                                                   Integer pageSize,
                                                   Integer orderStatus,
-                                                  Integer carrierId,
+                                                  String carrierId,
                                                   String con) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
@@ -645,7 +645,7 @@ public class OMSController {
                                                  Integer pageSize,
                                                  Integer type,
                                                  Integer orderStatus,
-                                                 Integer carrierId,
+                                                 String carrierId,
                                                  String  con) {
         return omsFeign.getOthersOrderMesToSend(mapValue==null?new HashMap<>(): mapValue, apiId, pageNum, pageSize, orderStatus, carrierId, type, con);
     }
@@ -653,6 +653,9 @@ public class OMSController {
     @ApiOperation(value = "修改运输订单方法：根据运输订单id修改运力id")
     @PostMapping("/updateOmstruckOrder")
     public Map<String, Object> updateOmstruckOrder(@RequestBody(required = false) Map<String,Object> map){
+        Integer orderId = Integer.parseInt(map.get("orderId").toString()) ;
+        map.remove("orderId");
+        map.put("orderId",orderId);
         return omsFeign.updateOmstruckOrder(map);
     }
 
@@ -662,4 +665,10 @@ public class OMSController {
         Map<String, Object> map = omsFeign.addSaleTruckOrder(mapValue);
         return map;
     }
+
+    @ApiOperation(value = "通过运单下的物资信息")
+    @PostMapping("/getOrderMaterialList")
+    public RESTfulResult getOrderMaterialList(@RequestParam Integer orderId) {
+        return omsFeign.getOrderMaterialList(orderId);
+    }
 }

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

@@ -420,9 +420,10 @@ public class RMScontroller {
                                                Integer pageNum,
                                                Integer pageSize,
                                                Integer apiId,
-                                               String con) {
+                                               String con,
+                                               String carrierSSOId) {
 
-        return rmsFeign.getCapacityList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
+        return rmsFeign.getCapacityList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con,carrierSSOId);
     }
 
     @ApiOperation(value="新增汽车衡信息", notes="根据rmsCapacity对象创建")
@@ -981,6 +982,41 @@ public class RMScontroller {
     }
 
 
+    /**
+     * 得到二级部门的下拉
+     * @return
+     */
+    @GetMapping("/getSecondShipper")
+    public Map<String,Object> getSecondShipper() {
+        return  rmsFeign.getSecondShipper();
+    }
+
+    /**
+     * 得到三级部门的下拉
+     * @return
+     */
+    @GetMapping("/getThirdShipper")
+    public Map<String,Object> getThirdShipper(@RequestParam Integer shipperId) {
+        return  rmsFeign.getThirdShipper(shipperId);
+    }
+
+    /**
+     * 新增人员权限
+     * @return
+     */
+    @PostMapping("/addPersonnel")
+    public Map<String,Object> addPersonnel(@RequestBody Map<String,Object> map) {
+        return  rmsFeign.addPersonnel(map);
+    }
+
+    /**
+     * 查询SSO主键和机构编码
+     * @return
+     */
+    @PostMapping("/getShipperMap")
+    public Map<String,Object> getShipperMap(@RequestParam Integer shipperId) {
+        return  rmsFeign.getShipperMap(shipperId);
+    }
     //根据运力id查询承运商
     @PostMapping(value = "getCarrierNameById/{id}")
     public Map<String,Object> getCarrierNameById(@PathVariable("id") BigDecimal id){
@@ -1015,4 +1051,11 @@ public class RMScontroller {
         return rmsFeign.deleteShipperResult(map);
     }
 
+    @PostMapping(value = "/getCarrierNameBySSOId")
+    public Map<String,Object> getCarrierNameBySSOId(@RequestParam("carrierSSOId") String carrierSSOId){
+        return rmsFeign.getCarrierNameBySSOId(carrierSSOId);
+    }
+
+
+
 }

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

@@ -1685,6 +1685,21 @@ public class TMSController extends BaseRESTfulController {
         return tmsTruckFeign.selectCountList(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize);
     }
 
+    //采购内转待装车实绩
+    @ApiOperation(value = "查询待装车运单列表")
+    @PostMapping("/cgNzLoadingResult")
+    public Map<String, Object> cgNzLoadingResult(@RequestBody(required = false) Map<String, Object> mapVal,
+                                               Integer apiId,
+                                               Integer pageNum,
+                                               Integer pageSize,
+                                               Integer orderType,
+                                               Integer orderStatus
+    ) {
+        return tmsTruckFeign.cgNzLoadingResult(mapVal==null?new HashMap<>():mapVal, apiId, pageNum, pageSize,orderType,orderStatus);
+    }
+
+
+
     /**
      * 内转物流卸货装车实绩
      *
@@ -1891,5 +1906,13 @@ public class TMSController extends BaseRESTfulController {
     ){
         return tmsTruckFeign.getRLFLReport(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, orderType);
     }
-
+    @ApiOperation(value="查询辅料燃料统计报表")
+    @PostMapping("/getAllSaleReport")
+    public Map<String, Object> getAllSaleReport(@RequestBody(required=false) Map<String,Object> mapValue,
+                                          Integer apiId,
+                                          Integer pageNum,
+                                          Integer pageSize, String carrierSsoId
+    ){
+        return tmsTruckFeign.getAllSaleReport(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, carrierSsoId);
+    }
 }

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

@@ -80,6 +80,34 @@ public class UniversalController extends BaseRESTfulController {
         return success(data);
     }
 
+    @ApiModelProperty(value = "查询所有发货单位")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "247", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping("/queryAllSupplierByLike")
+    public RESTfulResult queryAllSupplierByLike(@RequestBody(required = false) Map<String,Object> mapValue,
+                                             Integer pageNum,
+                                             Integer pageSize,
+                                             Integer apiId,
+                                             String index) {
+        if(mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        if(index != null){
+            mapValue.put("index","%" + index + "%");
+        }
+        List<Map<String, Object>> list = universalMapper.queryAllSupplierByLike(mapValue);
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList = universalMapper.queryAllSupplierByLike(mapValue);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        return success(data);
+    }
+
+
+
     @ApiModelProperty(value = "通过物资ID查询该物资的发货单位信息")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
@@ -122,14 +150,21 @@ public class UniversalController extends BaseRESTfulController {
                                         Integer apiId,
                                         Integer pageNum,
                                         Integer pageSize,
+                                        String carrierSsoId,
                                         String index
     ){
         if(mapValue == null){
             mapValue = new HashMap<>();
         }
         if(index != null){
-            mapValue.put("index", index + "%");
+            mapValue.put("index", "%" + index + "%");
         }
+        if(carrierSsoId != null){
+            if(!"null".equals(carrierSsoId)){
+                mapValue.put("carrierSsoId", carrierSsoId);
+            }
+        }
+
         //不分页筛选数据
         List<Map<String, Object>> allCapacity = universalMapper.getAllCapacityByCarrierLike(mapValue);
         PageHelper.startPage(pageNum,pageSize);
@@ -300,7 +335,8 @@ public class UniversalController extends BaseRESTfulController {
             if(index.length() == 0){
                 index = null;
             }else {
-                index += "%";
+//                index += "%";
+                index = "%"+index+"%";
             }
         }
         List<Map<String, Object>> list = universalMapper.getCarrierMesByLike(index);
@@ -365,18 +401,10 @@ public class UniversalController extends BaseRESTfulController {
         return universalService.sha1DigestUtils(text);
     }
 
-    @ApiModelProperty(value = "边输边查装货卸货点")
+    @ApiModelProperty(value = "查装货卸货点")
     @PostMapping("/selectUnloadingPoint")
-    public RESTfulResult selectUnloadingPoint(@RequestParam("index") String index) {
-        if(index != null){
-            if(index.length() == 0){
-                index = null;
-            }else {
-                index += "%";
-            }
-        }
-        List<Map<String, Object>> list = universalMapper.selectUnloadingPoint(index);
-        return success(list);
+    public List<Map<String, Object>> selectUnloadingPoint() {
+        return universalMapper.selectUnloadingPoint();
     }
 
     @ApiModelProperty(value = "模糊查询承运商")
@@ -410,4 +438,41 @@ public class UniversalController extends BaseRESTfulController {
         return success(data);
     }
 
+    @ApiModelProperty(value = "所有门岗下拉框")
+    @GetMapping("/getAllGatepost")
+    public List<Map<String,Object>> getAllGatepost(){
+        return universalMapper.getAllGatepost();
+    }
+
+    @ApiModelProperty(value = "模糊查询收货单位")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "418", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping("/getConsigneeListByLike")
+    public RESTfulResult getConsigneeListByLike(@RequestBody(required = false) Map<String,Object> mapValue,
+                                              Integer apiId,
+                                              Integer pageNum,
+                                              Integer pageSize,
+                                              String index) {
+        if(index != null){
+            if(index.length() == 0){
+                index = null;
+            }else {
+                index = "%" + index + "%";
+            }
+        }
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        mapValue.put("index",index);
+        List<Map<String, Object>> list = universalMapper.getConsigneeListByLike(mapValue);
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList = universalMapper.getConsigneeListByLike(mapValue);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        return success(data);
+    }
+
 }

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

@@ -596,7 +596,7 @@ public interface AmsFeign {
                                                    @RequestParam("apiId") Integer apiId,
                                                    @RequestParam("pageNum") Integer pageNum,
                                                    @RequestParam("pageSize") Integer pageSize,
-                                                   @RequestParam("carrierId") Integer carrierId);
+                                                   @RequestParam("carrierSsoId") String carrierSsoId);
 
     /**
      * 新增销售订单物资信息
@@ -1107,7 +1107,7 @@ public interface AmsFeign {
                                          @RequestParam Integer pageSize,
                                          @RequestParam Integer apiId,
                                          @RequestParam Integer planStatus,
-                                         @RequestParam Integer carrierId,
+                                         @RequestParam String carrierId,
                                          @RequestParam Integer planId);
     /**
      *新增用车需求
@@ -1151,7 +1151,7 @@ public interface AmsFeign {
     @ApiOperation(value="抢单/接收订单锁定")
     @PostMapping(value = "/api/v1/ams/amsdispatchsaleorders/lockDispatchSaleOrder")
     Map<String, Object> lockDispatchSaleOrder(@RequestParam Integer dispatchId,
-                                              @RequestParam Integer carrierId);
+                                              @RequestParam String carrierSsoId);
 
     @ApiOperation(value="查询app端承运商已抢到的单")
     @PostMapping(value = "/api/v1/ams/amsdispatchsaleorders/getLockDispatchSaleOrderList")
@@ -1170,6 +1170,7 @@ public interface AmsFeign {
                                                       @RequestParam Integer pageSize,
                                                       @RequestParam Integer apiId,
                                                       @RequestParam Integer dispatchType,
+                                                      @RequestParam String carrierSsoId,
                                                       @RequestParam String con) ;
 
     @PostMapping("/api/v1/ams/amstruckinwardrequirement/getPurchaseIdByBatch")
@@ -1192,7 +1193,7 @@ public interface AmsFeign {
 
 
     @PostMapping("/api/v1/ams/amstruckinwardrequirement/getWareHouse")
-    Map<String, Object> getWareHouse(@RequestBody(required = false) Map<String,Object> mapValue,
+    Map<String, Object>getWareHouse(@RequestBody(required = false) Map<String,Object> mapValue,
                                      @RequestParam Integer pageNum,
                                      @RequestParam Integer pageSize,
                                      @RequestParam Integer apiId,
@@ -1406,4 +1407,12 @@ public interface AmsFeign {
     @GetMapping(value = "api/v1/ams/dilnotices/getNoticeTypeId")
     Map<String,Object> getNoticeTypeId();
 
+    @PostMapping(value = "api/v1/ams/amssaleordermaterials/getTruckNoMaterialList")
+    RESTfulResult getTruckNoMaterialList(@RequestParam Integer saleOrderMaterialId);
+
+    @PostMapping(value = "api/v1/ams/amssaleordermaterials/getSaleMaterialList")
+    RESTfulResult getSaleMaterialList(@RequestParam Integer saleOrderId);
+
+    @PostMapping(value = "api/v1/ams/amsdispatchsaleorders/getDispatchMaterialList")
+    RESTfulResult getDispatchMaterialList(@RequestParam Integer dispatchId);
 }

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

@@ -31,6 +31,7 @@ public interface OmsFeign {
                                           @RequestParam("planId") Integer planId,
                                           @RequestParam("orderType") Integer orderType,
                                           @RequestParam("fuelOrder") Integer fuelOrder,
+                                          @RequestParam("carrierSSOId")String carrierSSOId,
                                           @RequestParam("con")String con);
 
     @PostMapping("api/v1/oms/omstruckorders/getAllTruckOrderReturnListMap")
@@ -98,6 +99,7 @@ public interface OmsFeign {
                                               @RequestParam("orderType") Integer orderType,
                                               @RequestParam("orderStatus") Integer orderStatus,
                                               @RequestParam("fuelOrder") Integer fuelOrder,
+                                              @RequestParam("carrierSSOId") String carrierSSOId,
                                               @RequestParam("con")      String con);
     /**
      * 展示承运商接收销售公司已接受的销售订单
@@ -125,11 +127,10 @@ public interface OmsFeign {
                                             @RequestParam("apiId")      Integer apiId,
                                             @RequestParam("pageNum")    Integer pageNum,
                                             @RequestParam("pageSize")   Integer pageSize,
-
                                             @RequestParam("orderType")  Integer orderType,
                                             @RequestParam("orderStatus")Integer orderStatus,
                                             @RequestParam("con")        String con,
-                                            @RequestParam("carrierId")  Integer carrierId
+                                            @RequestParam("carrierSsoId")  String carrierSsoId
     );
 
     /**
@@ -284,7 +285,8 @@ public interface OmsFeign {
                                                  @RequestParam Integer apiId,
                                                  @RequestParam Integer pageNum,
                                                  @RequestParam Integer pageSize,
-                                                 @RequestParam String con);
+                                                 @RequestParam String con,
+                                                 @RequestParam String carrierId);
 
     @GetMapping("api/v1/oms/omstruckorders/getReceivingUnit")
     public Map<String, Object> getReceivingUnit();
@@ -307,7 +309,7 @@ public interface OmsFeign {
                                            @RequestParam Integer pageNum,
                                            @RequestParam Integer pageSize,
                                            @RequestParam Integer orderStatus,
-                                           @RequestParam Integer carrierId,
+                                           @RequestParam String carrierId,
                                            @RequestParam String con);
 
     // 分派计划
@@ -359,7 +361,7 @@ public interface OmsFeign {
                                                        @RequestParam("pageNum") Integer pageNum,
                                                        @RequestParam("pageSize") Integer pageSize,
                                                        @RequestParam("orderStatus") Integer orderStatus,
-                                                       @RequestParam("carrierId") Integer carrierId,
+                                                       @RequestParam("carrierId") String carrierId,
                                                        @RequestParam("type") Integer type,
                                                        @RequestParam("con") String con
                                                        );
@@ -375,5 +377,9 @@ public interface OmsFeign {
     @ApiOperation(value = "根据运输订单号查询物资")
     @PostMapping("api/v1/oms/omstruckorderseparates/getUnloadOrderMaterial")
     Map<String, Object> getUnloadOrderMaterial(@RequestBody(required = false)Map<String, Object> map);
+
+    @ApiOperation(value = "根据运输订单id查询物资")
+    @PostMapping("api/v1/oms/omstruckorders/getOrderMaterialList")
+    RESTfulResult getOrderMaterialList(@RequestParam Integer orderId);
 }
 

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

@@ -217,7 +217,8 @@ public interface RmsFeign {
                                         @RequestParam Integer pageNum,
                                         @RequestParam Integer pageSize,
                                         @RequestParam Integer apiId,
-                                        @RequestParam String con);
+                                        @RequestParam String con,
+                                        @RequestParam String carrierSSOId);
 
     //根据id获取运力详细信息
     @PostMapping(value = "api/v1/rms/rmscapacity/getCapacityById/{id}")
@@ -532,6 +533,21 @@ public interface RmsFeign {
     Map<String, Object> deletePortYard(@PathVariable("warehouseId") BigDecimal warehouseId);
 
 
+    // 得到二级部门的下拉
+    @GetMapping(value = "api/v1/rms/rmspersonnel/getSecondShipper")
+    Map<String, Object> getSecondShipper();
+
+    // 得到三级部门的下拉
+    @GetMapping(value = "api/v1/rms/rmspersonnel/getThirdShipper")
+    Map<String, Object> getThirdShipper(@RequestParam Integer shipperId);
+
+    // 新增人员权限
+    @PostMapping(value = "api/v1/rms/rmspersonnel/addPersonnel")
+    Map<String, Object> addPersonnel(@RequestBody Map<String, Object> map);
+
+    // 查询SSO主键和机构编码
+    @PostMapping(value = "api/v1/rms/rmspersonnel/getShipperMap")
+    Map<String, Object> getShipperMap(@RequestParam Integer shipperId);
     //根据运力id查询承运商名称
     @PostMapping(value = "api/v1/rms/rmscarrier/getCarrierNameById/{id}")
     Map<String,Object> getCarrierNameById(@PathVariable("id") BigDecimal id);
@@ -552,4 +568,7 @@ public interface RmsFeign {
     @PostMapping(value = "api/v1/rms/rmsshipper/deleteShipperResult")
     Map<String,Object>  deleteShipperResult(@RequestBody(required = false) Map<String, Object> map);
 
+    @ApiOperation(value = "根据carrierSSOId查询承运商")
+    @PostMapping(value = "api/v1/rms/rmscapacity/getCarrierNameBySSOId")
+    Map<String, Object> getCarrierNameBySSOId(@RequestParam("carrierSSOId") String carrierSSOId);
 }

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

@@ -346,6 +346,22 @@ public interface TmsTruckFeign {
                                       @RequestParam("pageSize") Integer pageSize,
                                       @RequestParam("orderType") Integer orderType
     );
+
+    @PostMapping("api/v1/truckTms/tmstruckloadresults/cgNzLoadingResult")
+    Map<String, Object> cgNzLoadingResult(@RequestBody(required = false) Map<String, Object> mapval,
+                                          @RequestParam Integer apiId,
+                                          @RequestParam Integer pageNum,
+                                          @RequestParam Integer pageSize,
+                                          @RequestParam Integer orderType,
+                                          @RequestParam Integer orderStatus);
+
+    @PostMapping("api/v1/truckTms/statisticalReport/getAllSaleReport")
+    Map<String, Object> getAllSaleReport(@RequestBody(required=false) Map<String,Object> mapValue,
+                                      @RequestParam("apiId") Integer apiId,
+                                      @RequestParam("pageNum") Integer pageNum,
+                                      @RequestParam("pageSize") Integer pageSize,
+                                      @RequestParam("carrierSsoId")   String carrierSsoId
+    );
 }
 
 

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

@@ -14,8 +14,11 @@ public interface DilVersionMapper extends IBaseMapper<DilVersion, BigDecimal> {
     @Select("select max(DV.VERSION_ID) + 1 from DIL_VERSION")
     BigDecimal selectMaxId();
 
-    //查询最新的版本号
-    String compareVersion();
+    //查询最新的APP版本号
+    String getAppVersion();
+
+    //查询最新的PDA版本号
+    String getPDAVersion();
 
     //查询版本号是否已存在
     Integer getVersionId(String version);

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

@@ -59,6 +59,19 @@ public interface UniversalMapper {
     // 所有承运商
     List<Map<String, Object>> getCarrierListByLike(Map<String, Object> mapValue);
 
-    //边输边查卸货点
-    List<Map<String, Object>> selectUnloadingPoint(String index);
+    //查卸货点
+    List<Map<String, Object>> selectUnloadingPoint();
+
+    // 查询所有门岗
+    List<Map<String, Object>> getAllGatepost();
+
+    // 模糊查询收货单位
+    List<Map<String, Object>> getConsigneeListByLike(Map<String, Object> mapValue);
+
+    //模糊查询所有发货单位
+    List<Map<String, Object>> queryAllSupplierByLike(Map<String, Object> mapValue);
+
+    // 通过ssoId查询承运商id
+    BigDecimal getCarrierIdBySSO(String carrierSsoId);
+
 }

src/main/java/com/steerinfo/dil/model/DilVersion.java

@@ -50,6 +50,12 @@ public class DilVersion implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="记录创建或修改备注",required=false)
     private String insertUpdateRemark;
 
+    /**
+     * 版本类型（0：APP   1：PDA)(VERSION_TYPE,DECIMAL,0)
+     */
+    @ApiModelProperty(value="版本类型（0：APP   1：PDA)",required=false)
+    private Short versionType;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -118,6 +124,14 @@ public class DilVersion implements IBasePO<BigDecimal> {
         this.insertUpdateRemark = insertUpdateRemark == null ? null : insertUpdateRemark.trim();
     }
 
+    public Short getVersionType() {
+        return versionType;
+    }
+
+    public void setVersionType(Short versionType) {
+        this.versionType = versionType;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -131,6 +145,7 @@ public class DilVersion implements IBasePO<BigDecimal> {
         sb.append(", updateUsername=").append(updateUsername);
         sb.append(", updateTime=").append(updateTime);
         sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
+        sb.append(", versionType=").append(versionType);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

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

@@ -20,7 +20,7 @@ import java.math.BigDecimal;
  */
 public interface IDilVersionService{
 
-    String compareAppVersion();
+    String getAppVersion();
 
     String addAppVersion(String version);
 

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

@@ -32,12 +32,21 @@ public class DilVersionServiceImpl implements IDilVersionService {
 
 
     /**
-     * 传入版本号查询是否为最新版本
-     * @return 0 不需要更新  1 需要更新
+     * 查询最新版本号
+     * @return 版本号
      */
-    public String compareAppVersion(){
+    public String getAppVersion(){
         //查找当前最新版本号
-        return  dilVersionMapper.compareVersion();
+        return  dilVersionMapper.getAppVersion();
+    }
+
+    /**
+     * 查询PDA最新版本号
+     * @return
+     */
+    public String getPDAVersion(){
+        //查询PDA当前最新版本号
+        return dilVersionMapper.getPDAVersion();
     }
 
     /**

src/main/resources/bootstrap.yml

@@ -21,11 +21,8 @@ eureka:
     prefer-ip-address: true
     status-page-url: http://${spring.cloud.client.ip-address}:${server.port}/swagger-ui.html#/
     instance-id: ${spring.cloud.client.ip-address}:${server.port}
-
-
 openfeign:
 #  正式环境
-
     ColumnDataFeign:
       url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
     AmsFeign:
@@ -41,7 +38,7 @@ openfeign:
     TmsTrainFeign:
       url: ${TMSTRAINFEIGN_URL:172.16.33.166:8086}
     TmsTruckFeign:
-      url: ${TMSTRUCKFEIGN_URL:localhost:8088}
+      url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
     TmsshipFeign:
       url: ${TMSSHIPFEIGN_URL:172.16.33.166:8090}
     WMSHFeign:
@@ -51,7 +48,9 @@ openfeign:
     OMSFeign:
       url: ${OMSFEIGN_URL:172.16.33.166:8095}
     RmsFeign:
-      url: ${RMSFEIGN_HRL:localhost:8060}
+      url: ${RMSFEIGN_URL:172.16.33.166:8060}
+
+
 
   #测试环境
 #  ColumnDataFeign:

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

@@ -9,23 +9,24 @@
     <result column="UPDATE_USERNAME" jdbcType="VARCHAR" property="updateUsername" />
     <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
     <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark" />
+    <result column="VERSION_TYPE" jdbcType="DECIMAL" property="versionType" />
   </resultMap>
   <sql id="columns">
     VERSION_ID, VERSION_VALUE, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, 
-    INSERT_UPDATE_REMARK
+    INSERT_UPDATE_REMARK, VERSION_TYPE
   </sql>
   <sql id="columns_alias">
     t.VERSION_ID, t.VERSION_VALUE, t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, 
-    t.UPDATE_TIME, t.INSERT_UPDATE_REMARK
+    t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.VERSION_TYPE
   </sql>
   <sql id="select">
-    SELECT <include refid="columns"/> FROM DIL_VERSION
+    SELECT <include refid="columns" /> FROM DIL_VERSION
   </sql>
   <sql id="select_alias">
-    SELECT <include refid="columns_alias"/> FROM DIL_VERSION t
+    SELECT <include refid="columns_alias" /> FROM DIL_VERSION t
   </sql>
   <sql id="where">
-    <where> 
+    <where>
       <if test="versionId != null">
         and VERSION_ID = #{versionId}
       </if>
@@ -47,10 +48,13 @@
       <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
         and INSERT_UPDATE_REMARK = #{insertUpdateRemark}
       </if>
+      <if test="versionType != null">
+        and VERSION_TYPE = #{versionType}
+      </if>
     </where>
   </sql>
   <sql id="whereLike">
-    <where> 
+    <where>
       <if test="versionId != null">
         and VERSION_ID = #{versionId}
       </if>
@@ -72,6 +76,9 @@
       <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
         and INSERT_UPDATE_REMARK LIKE '%${insertUpdateRemark}%'
       </if>
+      <if test="versionType != null">
+        and VERSION_TYPE = #{versionType}
+      </if>
     </where>
   </sql>
   <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
@@ -80,33 +87,36 @@
   </delete>
   <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
     delete from DIL_VERSION
-    where 1!=1 
-      <if test="versionValue != null and versionValue != ''">
-        or VERSION_VALUE = #{versionValue}
-      </if>
-      <if test="insertUsername != null and insertUsername != ''">
-        or INSERT_USERNAME = #{insertUsername}
-      </if>
-      <if test="insertTime != null">
-        or TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = '#{insertTime}'
-      </if>
-      <if test="updateUsername != null and updateUsername != ''">
-        or UPDATE_USERNAME = #{updateUsername}
-      </if>
-      <if test="updateTime != null">
-        or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
-      </if>
-      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
-        or INSERT_UPDATE_REMARK = #{insertUpdateRemark}
-      </if>
+    where 1!=1
+    <if test="versionValue != null and versionValue != ''">
+      or VERSION_VALUE = #{versionValue}
+    </if>
+    <if test="insertUsername != null and insertUsername != ''">
+      or INSERT_USERNAME = #{insertUsername}
+    </if>
+    <if test="insertTime != null">
+      or TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = '#{insertTime}'
+    </if>
+    <if test="updateUsername != null and updateUsername != ''">
+      or UPDATE_USERNAME = #{updateUsername}
+    </if>
+    <if test="updateTime != null">
+      or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
+    </if>
+    <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+      or INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+    </if>
+    <if test="versionType != null">
+      or VERSION_TYPE = #{versionType}
+    </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.dil.model.DilVersion">
-    insert into DIL_VERSION (VERSION_ID, VERSION_VALUE, INSERT_USERNAME, 
-      INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, 
-      INSERT_UPDATE_REMARK)
-    values (#{versionId,jdbcType=DECIMAL}, #{versionValue,jdbcType=VARCHAR}, #{insertUsername,jdbcType=VARCHAR}, 
-      #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, 
-      #{insertUpdateRemark,jdbcType=VARCHAR})
+    insert into DIL_VERSION (VERSION_ID, VERSION_VALUE, INSERT_USERNAME,
+                             INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME,
+                             INSERT_UPDATE_REMARK, VERSION_TYPE)
+    values (#{versionId,jdbcType=DECIMAL}, #{versionValue,jdbcType=VARCHAR}, #{insertUsername,jdbcType=VARCHAR},
+            #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP},
+            #{insertUpdateRemark,jdbcType=VARCHAR}, #{versionType,jdbcType=DECIMAL})
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.dil.model.DilVersion">
     insert into DIL_VERSION
@@ -132,6 +142,9 @@
       <if test="insertUpdateRemark != null">
         INSERT_UPDATE_REMARK,
       </if>
+      <if test="versionType != null">
+        VERSION_TYPE,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="versionId != null">
@@ -155,16 +168,20 @@
       <if test="insertUpdateRemark != null">
         #{insertUpdateRemark,jdbcType=VARCHAR},
       </if>
+      <if test="versionType != null">
+        #{versionType,jdbcType=DECIMAL},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.DilVersion">
     update DIL_VERSION
     set VERSION_VALUE = #{versionValue,jdbcType=VARCHAR},
-      INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
-      INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
-      UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
-      UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
-      INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR}
+        INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+        INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+        UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+        UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+        INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
+        VERSION_TYPE = #{versionType,jdbcType=DECIMAL}
     where VERSION_ID = #{versionId,jdbcType=DECIMAL}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.DilVersion">
@@ -188,88 +205,95 @@
       <if test="insertUpdateRemark != null">
         INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
       </if>
+      <if test="versionType != null">
+        VERSION_TYPE = #{versionType,jdbcType=DECIMAL},
+      </if>
     </set>
     where VERSION_ID = #{versionId,jdbcType=DECIMAL}
   </update>
   <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
-    <include refid="select"/>
+    <include refid="select" />
     where VERSION_ID = #{versionId,jdbcType=DECIMAL}
   </select>
   <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-    <include refid="select"/>
-    <include refid="where"/>
+    <include refid="select" />
+    <include refid="where" />
   </select>
   <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-    <include refid="select"/>
-    <include refid="whereLike"/>
+    <include refid="select" />
+    <include refid="whereLike" />
   </select>
   <insert id="batchInsert" parameterType="java.util.List">
-    insert into DIL_VERSION 
-      (VERSION_ID, 
-      VERSION_VALUE, INSERT_USERNAME, 
-      INSERT_TIME, UPDATE_USERNAME, 
-      UPDATE_TIME, INSERT_UPDATE_REMARK
-      )
-    ( <foreach collection="list" item="item" separator="union all"> 
-   select  
-      #{item.versionId,jdbcType=DECIMAL}, 
-      #{item.versionValue,jdbcType=VARCHAR}, #{item.insertUsername,jdbcType=VARCHAR}, 
-      #{item.insertTime,jdbcType=TIMESTAMP}, #{item.updateUsername,jdbcType=VARCHAR}, 
-      #{item.updateTime,jdbcType=TIMESTAMP}, #{item.insertUpdateRemark,jdbcType=VARCHAR}
-       from dual  
-   </foreach> )
+    insert into DIL_VERSION
+    (VERSION_ID,
+    VERSION_VALUE, INSERT_USERNAME,
+    INSERT_TIME, UPDATE_USERNAME,
+    UPDATE_TIME, INSERT_UPDATE_REMARK,
+    VERSION_TYPE)
+    ( <foreach collection="list" item="item" separator="union all">
+    select
+    #{item.versionId,jdbcType=DECIMAL},
+    #{item.versionValue,jdbcType=VARCHAR}, #{item.insertUsername,jdbcType=VARCHAR},
+    #{item.insertTime,jdbcType=TIMESTAMP}, #{item.updateUsername,jdbcType=VARCHAR},
+    #{item.updateTime,jdbcType=TIMESTAMP}, #{item.insertUpdateRemark,jdbcType=VARCHAR},
+    #{item.versionType,jdbcType=DECIMAL} from dual
+  </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
-     update DIL_VERSION
-     set
-       VERSION_ID=
-       <foreach collection="list" item="item" index="index" separator=" " open="case VERSION_ID" close="end">
-          when #{item.versionId,jdbcType=DECIMAL} then #{item.versionId,jdbcType=DECIMAL}
-       </foreach>
-       ,VERSION_VALUE=
-       <foreach collection="list" item="item" index="index" separator=" " open="case VERSION_ID" close="end">
-          when #{item.versionId,jdbcType=DECIMAL} then #{item.versionValue,jdbcType=VARCHAR}
-       </foreach>
-       ,INSERT_USERNAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case VERSION_ID" close="end">
-          when #{item.versionId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
-       </foreach>
-       ,INSERT_TIME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case VERSION_ID" close="end">
-          when #{item.versionId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,UPDATE_USERNAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case VERSION_ID" close="end">
-          when #{item.versionId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
-       </foreach>
-       ,UPDATE_TIME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case VERSION_ID" close="end">
-          when #{item.versionId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,INSERT_UPDATE_REMARK=
-       <foreach collection="list" item="item" index="index" separator=" " open="case VERSION_ID" close="end">
-          when #{item.versionId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
-       </foreach>
-     where VERSION_ID in 
-     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
-    #{item.versionId,jdbcType=DECIMAL}
-     </foreach> 
+    update DIL_VERSION
+    set
+    VERSION_ID=
+    <foreach close="end" collection="list" index="index" item="item" open="case VERSION_ID" separator=" ">
+      when #{item.versionId,jdbcType=DECIMAL} then #{item.versionId,jdbcType=DECIMAL}
+    </foreach>
+    ,VERSION_VALUE=
+    <foreach close="end" collection="list" index="index" item="item" open="case VERSION_ID" separator=" ">
+      when #{item.versionId,jdbcType=DECIMAL} then #{item.versionValue,jdbcType=VARCHAR}
+    </foreach>
+    ,INSERT_USERNAME=
+    <foreach close="end" collection="list" index="index" item="item" open="case VERSION_ID" separator=" ">
+      when #{item.versionId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
+    </foreach>
+    ,INSERT_TIME=
+    <foreach close="end" collection="list" index="index" item="item" open="case VERSION_ID" separator=" ">
+      when #{item.versionId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
+    </foreach>
+    ,UPDATE_USERNAME=
+    <foreach close="end" collection="list" index="index" item="item" open="case VERSION_ID" separator=" ">
+      when #{item.versionId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
+    </foreach>
+    ,UPDATE_TIME=
+    <foreach close="end" collection="list" index="index" item="item" open="case VERSION_ID" separator=" ">
+      when #{item.versionId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
+    </foreach>
+    ,INSERT_UPDATE_REMARK=
+    <foreach close="end" collection="list" index="index" item="item" open="case VERSION_ID" separator=" ">
+      when #{item.versionId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
+    </foreach>
+    ,VERSION_TYPE=
+    <foreach close="end" collection="list" index="index" item="item" open="case VERSION_ID" separator=" ">
+      when #{item.versionId,jdbcType=DECIMAL} then #{item.versionType,jdbcType=DECIMAL}
+    </foreach>
+    where VERSION_ID in
+    <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
+      #{item.versionId,jdbcType=DECIMAL}
+    </foreach>
   </update>
   <delete id="batchDelete" parameterType="java.util.List">
     delete from DIL_VERSION
-    where VERSION_ID in 
-    <foreach collection="list" item="id" open="(" close=")" separator=",">
+    where VERSION_ID in
+    <foreach close=")" collection="list" item="id" open="(" separator=",">
       #{id}
     </foreach>
   </delete>
   <!-- 友情提示！！！-->
   <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
-
-  <select id="compareVersion" resultType="string">
+  <select id="getAppVersion" resultType="string">
     select *
     from (
            select DV.VERSION_VALUE
            from DIL_VERSION DV
+           where DV.VERSION_TYPE = 0
            order by DV.VERSION_ID desc
          )
     where ROWNUM = 1
@@ -281,4 +305,16 @@
     where DV.VERSION_VALUE = #{versionValue}
   </select>
 
+
+  <select id="getPDAVersion" resultType="java.lang.String">
+    select *
+    from (
+           select DV.VERSION_VALUE
+           from DIL_VERSION DV
+           where DV.VERSION_TYPE = 1
+           order by DV.VERSION_ID desc
+         )
+    where ROWNUM = 1
+  </select>
+
 </mapper>

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

@@ -149,16 +149,27 @@
                         RC.CAPACITY_ID        "capacityId",
                         RC.CAPACITY_NUMBER     "capacityNumber",
                         RCA.CARRIER_NAME       "carrierName"
+
                  FROM RMS_CAPACITY RC
                           JOIN RMS_CARRIER RCA
                                 ON RCA.CARRIER_ID = RC.CARRIER_ID
                  WHERE RC.CAPACITY_STATUS = 0 AND RC.CAPACITY_TYPE_ID = 1
                    <if test="index != null">
-                       and RCA.CARRIER_NAME LIKE #{index}
+                       and RC.CAPACITY_NUMBER LIKE #{index}
+                   </if>
+                   <if test="carrierSsoId != null">
+                       and RCA.CARRIER_SSO_ID = #{carrierSsoId}
                    </if>
              )
     </select>
 
+    <select id="getCarrierIdBySSO" parameterType="java.lang.String" resultType="DECIMAL" >
+        SELECT
+            RC.CARRIER_ID AS "carrierId"
+        FROM RMS_CARRIER RC
+        WHERE RC.CARRIER_SSO_ID = #{carrierSsoId}
+    </select>
+
 <!--    通过订单ID查询物资子表信息  -->
     <select id="getMaterialMesByOrderId" parameterType="int" resultType="java.util.Map">
         select *
@@ -314,7 +325,7 @@
                 RM.MATERIAL_CODE LIKE #{startNum}
             </if>
             <if test="startNum == null">
-                RM.MATERIAL_CODE LIKE '010%' OR RM.MATERIAL_CODE LIKE '0801%'
+                RM.MATERIAL_CODE LIKE '010%' OR RM.MATERIAL_CODE LIKE '080%'
             </if>
         </where>
         )
@@ -480,13 +491,41 @@
         select Rw.WAREHOUSE_NAME "warehouseName",
                RW.WAREHOUSE_ID "warehouseId"
         from RMS_WAREHOUSE RW
-        where
-              <if test="index != null">
-                  RW.WAREHOUSE_NAME like #{index}
-              </if>
-              <if test="index == null">
-                  rownum &lt; 10
-              </if>
         order by "warehouseName"
     </select>
+
+    <select id="getAllGatepost" resultType="java.util.Map" >
+        SELECT
+            RG.GATEPOST_ID AS "gatepostId",
+            RG.GATEPOST_NAME AS "gatepostName"
+        FROM RMS_GATEPOST RG
+    </select>
+
+    <!-- 模糊查询收货单位 -->
+    <select id="getConsigneeListByLike" parameterType="java.util.Map" resultType="java.util.Map" >
+        SELECT
+        RC.CONSIGNEE_COMPANY_NAME AS "consigneeCompanyName"
+        FROM RMS_CONSIGNEE RC
+        WHERE
+        <if test="index != null">
+            RC.CONSIGNEE_COMPANY_NAME like #{index}
+        </if>
+        order by "consigneeCompanyName"
+    </select>
+
+    <select id="queryAllSupplierByLike" resultType="java.util.Map">
+        select *
+        from (
+        select distinct RS.SUPPLIER_ID      "supplierId",
+        RS.SUPPLIER_NAME    "supplierName",
+        RS.SUPPLIER_ADDRESS "supplierAddress"
+        from RMS_SUPPLIER RS
+        )
+        <where>
+            <if test="index != null">
+                "supplierName" like #{index}
+            </if>
+        </where>
+    </select>
+
 </mapper>