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

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

@@ -1108,20 +1108,20 @@ public class AMScontroller{
         return amsFeign.getArriveName();
     }
 
-    @ApiModelProperty(value = "查询所有的钢材物资")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "apiId", value = "232", required = false, dataType = "BigDecimal")
-    })
-    @PostMapping("/getAllSteelMaterialMes")
-    public Map<String, Object> getAllSteelMaterialMes(@RequestBody(required = false) Map<String,Object> mapValue,
-                                                Integer pageNum,
-                                                Integer pageSize,
-                                                Integer apiId,
-                                                String con) {
-        return amsFeign.getAllSteelMaterialMes(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId, con);
-    }
+//    @ApiModelProperty(value = "查询所有的钢材物资")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "apiId", value = "232", required = false, dataType = "BigDecimal")
+//    })
+//    @PostMapping("/getAllSteelMaterialMes")
+//    public Map<String, Object> getAllSteelMaterialMes(@RequestBody(required = false) Map<String,Object> mapValue,
+//                                                Integer pageNum,
+//                                                Integer pageSize,
+//                                                Integer apiId,
+//                                                String con) {
+//        return amsFeign.getAllSteelMaterialMes(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId, con);
+//    }
 
     @ApiModelProperty(value = "查询PC端公开抢单")
     @ApiImplicitParams({
@@ -1197,4 +1197,9 @@ public class AMScontroller{
     public Map<String,Object> getOffsetWarehouse() {
         return amsFeign.getOffsetWarehouse();
     }
+
+    @PostMapping("/finishTruckPlan/{planId}")
+    public Map<String, Object> finishTruckPlan(@PathVariable("planId") Integer planId){
+        return amsFeign.finishTruckPlan(planId);
+    }
 }

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

@@ -567,4 +567,45 @@ public class OMSController {
     public List<Map<String,Object>> sendOrderToApp(@RequestParam String capacityNumber) {
         return omsFeign.sendOrderToApp(capacityNumber);
     }
+
+    @ApiOperation(value = "分解异地库计划")
+    @PostMapping("/apportionInwardOffsetOrder")
+    public Map<String,Object> apportionInwardOffsetOrder(@RequestBody Map<String,Object> mapvalue) {
+        return omsFeign.apportionInwardOffsetOrder(mapvalue);
+    }
+
+    @ApiOperation(value = "查询司机的所有运输订单信息")
+    @PostMapping("/getAllOrderMessage")
+    public List<Map<String,Object>> getAllOrderMessage(@RequestParam String capacityNumber) {
+        return omsFeign.getAllOrderMessage(capacityNumber);
+    }
+
+    @ApiOperation(value = "司机确认订单")
+    @PostMapping("/driverConfirmation")
+    public Map<String,Object> driverConfirmation(@RequestBody(required = false) Map<String,Object> mapvalue) {
+        return omsFeign.driverConfirmation(mapvalue);
+    }
+    @ApiOperation(value = "通过运输订单号查询订单信息给司机")
+    @PostMapping("/getMessageToApp")
+    public Map<String, Object> getMessageToApp(@RequestBody(required = false) Map<String,Object> mapvalue) {
+        return omsFeign.getMessageToApp(mapvalue);
+    }
+
+    @ApiOperation(value = "通过车牌号查询所有已下发未接收的订单信息")
+    @PostMapping("/getAllOrderMessagesByCapacityNum")
+    public List<Map<String, Object>> getAllOrderMessagesByCapacityNum(@RequestBody(required = false) Map<String,Object> mapvalue){
+        return  omsFeign.getAllOrderMessagesByCapacityNum(mapvalue);
+    }
+
+    @ApiOperation(value = "通过车牌号查询该车牌下所有已接收的订单ID")
+    @PostMapping("/getReceiveOrderIdListByCapacityNum")
+    public List<Integer> getReceiveOrderIdListByCapacityNum(@RequestBody(required = false) Map<String, Object> mapvalue) {
+        return omsFeign.getReceiveOrderIdListByCapacityNum(mapvalue);
+    }
+
+    @ApiOperation(value = "通过车牌号查询该车牌下所有已接收的订单ID")
+    @PostMapping("/getAllRefuseOrderNumberByCapacity")
+    public List<Map<String, Object>> getAllRefuseOrderNumberByCapacity(@RequestBody(required = false) Map<String,Object> mapvalue){
+        return omsFeign.getAllRefuseOrderNumberByCapacity(mapvalue);
+    }
 }

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

@@ -15,39 +15,40 @@ import java.util.Map;
 public class RMScontroller {
     @Autowired
     RmsFeign rmsFeign;
+
     @ApiOperation(value="展示司机信息")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(218)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId(339)", value = "动态表头", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
     })
     @PostMapping("/getCarDriverList")
     public Map<String, Object> getCarDriverList(@RequestBody(required=false) Map<String,Object> mapValue,
-                                            Integer apiId,
-                                            Integer pageNum,
-                                            Integer pageSize
+                                                Integer apiId,
+                                                Integer pageNum,
+                                                Integer pageSize
     ){
         return   rmsFeign.getCarDriverList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
     }
     @ApiOperation(value="创建", notes="根据RmsCarDriver对象创建")
     @ApiImplicitParam(name = "rmsCarDriver", value = "详细实体rmsCarDriver", required = true, dataType = "RmsCarDriver")
-    //@RequiresPermissions("rmscardriver:create")
     @PostMapping(value = "/insertCarDriver")
     public Map<String, Object> insertCarDriver(@RequestBody(required = false) Map<String, Object> map){
         return rmsFeign.insertCarDriver(map);
     }
 
-//    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象，并根据传过来的rmsCarDriver信息来更新详细信息")
-//    @ApiImplicitParams({
-//            @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal"),
-//            @ApiImplicitParam(name = "rmsCarDriver", value = "详细实体rmsCarDriver", required = true, dataType = "RmsCarDriver")
-//    })
-//    @PostMapping(value = "/updateCarDriver/{id}")
-//    RESTfulResult updateCarDriver(@PathVariable("id") String id) {
-//        return rmsFeign.updateCarDriver(id);
-//    }
+    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象，并根据传过来的rmsCarDriver信息来更新详细信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal"),
+            @ApiImplicitParam(name = "rmsCarDriver", value = "详细实体rmsCarDriver", required = true, dataType = "RmsCarDriver")
+    })
+    @PostMapping(value = "/updateCarDriver", produces  = "application/json;charset=UTF-8")
+    public Map<String, Object> updateCarDriver(@RequestBody Map<String, Object> map){
+        return rmsFeign.updateCarDriver(map);
+    }
+
     @ApiOperation(value="删除司机信息", notes="根据url的id来指定更新对象，并根据传过来的rmsCarDriver信息删除司机信息")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal"),
@@ -57,6 +58,24 @@ public class RMScontroller {
     Map<String, Object> deleteCarDriver(@PathVariable("id") BigDecimal id) {
         return rmsFeign.deleteCarDriver(id);
     }
+
+    @ApiOperation(value="获取司机详细信息", notes="根据url的id来获取详细信息")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal")
+    @PostMapping(value = "/getCarDriverById/{id}")
+    public Map<String, Object> getCarDriverById(@PathVariable("id") BigDecimal id){
+        return rmsFeign.getCarDriverById(id);
+    }
+    @PostMapping("/getCarDriverResultList")
+    @ApiOperation(value = "模糊查询司机")
+    public Map<String, Object> getCarDriverResultList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                      Integer pageNum,
+                                                      Integer pageSize,
+                                                      Integer apiId,
+                                                      String con) {
+
+        return rmsFeign.getCarDriverResultList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
+    }
+
     //获取承运商列表
     @ApiOperation(value="获取承运商列表")
     @ApiImplicitParams({
@@ -69,11 +88,15 @@ public class RMScontroller {
 
     @PostMapping("/getCarrierList")
     public Map<String, Object> getCarrierList(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                Integer apiId,
-                                                Integer pageNum,
-                                                Integer pageSize
+                                              Integer apiId,
+                                              Integer pageNum,
+                                              Integer pageSize,
+                                              String con
     ){
-        return   rmsFeign.getCarrierList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
+        if (mapValue==null){
+            mapValue=new HashMap<>();
+        }
+        return   rmsFeign.getCarrierList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize,con);
     }
     @ApiOperation(value="新建承运商", notes="根据rmsCarrier对象创建")
     @ApiImplicitParam(name = "rmsCarrier", value = "详细实体rmsCarrier", required = true, dataType = "rmsCarrier")
@@ -87,6 +110,20 @@ public class RMScontroller {
     public Map<String, Object> deleteCarrier(@PathVariable("id")BigDecimal id){
         return rmsFeign.deleteCarrier(id);
     }
+
+    @ApiOperation(value="更新承运商", notes="根据rmsCarrier对象创建")
+    @ApiImplicitParam(name = "rmsCarrier", value = "详细实体rmsCarrier", required = true, dataType = "rmsCarrier")
+    @PostMapping(value = "/updateCarrier")
+    public Map<String, Object> updateCarrier(@RequestBody(required = false) Map<String, Object> map){
+        return rmsFeign.updateCarrier(map);
+    }
+    @ApiOperation(value="根据id查询详细承运商信息", notes="根据rmsCarrier对象创建")
+    @ApiImplicitParam(name = "rmsCarrier", value = "详细实体rmsCarrier", required = true, dataType = "rmsCarrier")
+    @PostMapping(value = "/getCarrierById/{id}")
+    public Map<String, Object> getCarrierById(@PathVariable("id")BigDecimal id){
+        return rmsFeign.getCarrierById(id);
+    }
+
     //获取物资列表
     @ApiOperation(value="获取物资列表")
     @ApiImplicitParams({
@@ -96,14 +133,14 @@ public class RMScontroller {
             @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
     })
-
     @PostMapping("/getMaterialList")
     public Map<String, Object> getMaterialList(@RequestBody(required=false) Map<String,Object> mapValue,
-                                              Integer apiId,
-                                              Integer pageNum,
-                                              Integer pageSize
+                                               Integer apiId,
+                                               Integer pageNum,
+                                               Integer pageSize,
+                                               String con
     ){
-        return   rmsFeign.getMaterialList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
+        return   rmsFeign.getMaterialList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize,con);
     }
     @ApiOperation(value="新增物资", notes="根据rmsMaterial对象创建")
     @ApiImplicitParam(name = "rmsMaterial", value = "详细实体rmsMaterial", required = true, dataType = "rmsMaterial")
@@ -117,6 +154,20 @@ public class RMScontroller {
     public Map<String, Object> deleteMaterial(@PathVariable("id")BigDecimal id){
         return rmsFeign.deleteMaterial(id);
     }
+
+    @ApiOperation(value="更新物资", notes="根据rmsMaterial对象创建")
+    @ApiImplicitParam(name = "rmsMaterial", value = "详细实体rmsMaterial", required = true, dataType = "rmsMaterial")
+    @PostMapping(value = "/updateMaterial")
+    public Map<String, Object> updateMaterial(@RequestBody(required = false) Map<String, Object> map){
+        return rmsFeign.updateMaterial(map);
+    }
+    @ApiOperation(value="根据id查询原料信息", notes="根据rmsCarrier对象创建")
+    @ApiImplicitParam(name = "rmsMaterial", value = "详细实体rmsMaterial", required = true, dataType = "rmsMaterial")
+    @PostMapping(value = "/getMaterialById/{id}")
+    public Map<String, Object> getMaterialById(@PathVariable("id") BigDecimal id){
+        return rmsFeign.getMaterialById(id);
+    }
+
     @ApiOperation(value="获取人员信息列表")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
@@ -127,12 +178,15 @@ public class RMScontroller {
     })
 
     @PostMapping("/getPersonnelList")
-    public Map<String, Object> getPersonnelList(@RequestBody(required=false) Map<String,Object> mapValue,
-                                               Integer apiId,
-                                               Integer pageNum,
-                                               Integer pageSize
+    public Map<String, Object> getPersonnelList(@RequestBody(required = false) Map<String,Object> mapVal,
+                                                Integer apiId,
+                                                Integer pageNum,
+                                                Integer pageSize,
+
+                                                String con
     ){
-        return   rmsFeign.getPersonnelList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
+
+        return   rmsFeign.getPersonnelList(mapVal==null?new HashMap<>():mapVal, apiId, pageNum, pageSize,con);
     }
     @ApiOperation(value="新增人员信息", notes="根据rmsMaterial对象创建")
     @ApiImplicitParam(name = "rmsPersonnel", value = "详细实体rmsPersonnel", required = true, dataType = "rmsPersonnel")
@@ -140,13 +194,28 @@ public class RMScontroller {
     public Map<String, Object> insertPersonnel(@RequestBody(required = false) Map<String, Object> map){
         return rmsFeign.insertPersonnel(map);
     }
-    @ApiOperation(value="删除", notes="根据rmsCarrier对象创建")
+    @ApiOperation(value="删除", notes="根据rmsPersonnel对象创建")
     @ApiImplicitParam(name = "rmsMaterial", value = "详细实体rmsPersonnel", required = true, dataType = "rmsPersonnel")
     @PostMapping(value = "/deletePersonnel/{id}")
     public Map<String, Object> deletePersonnel(@PathVariable("id")BigDecimal id){
         return rmsFeign.deletePersonnel(id);
     }
-    @ApiOperation(value="获取承运商列表")
+
+    @ApiOperation(value="更新人员信息", notes="根据rmsMaterial对象创建")
+    @ApiImplicitParam(name = "rmsPersonnel", value = "详细实体rmsPersonnel", required = true, dataType = "rmsPersonnel")
+    @PostMapping(value = "/updatePersonnel")
+    public Map<String, Object> updatePersonnel(@RequestBody(required = false) Map<String, Object> map){
+        return rmsFeign.updatePersonnel(map);
+    }
+    @ApiOperation(value="根据id更新详细人员信息", notes="根据rmsPersonnel对象创建")
+    @ApiImplicitParam(name = "rmsPersonnel", value = "详细实体rmsPersonnel", required = true, dataType = "rmsPersonnel")
+    @PostMapping(value = "/getPersonnelById/{personnelId}")
+    public Map<String, Object> getPersonnelById(@PathVariable("personnelId")BigDecimal personnelId){
+        return rmsFeign.getPersonnelById(personnelId);
+    }
+
+    @ApiOperation(value="获取托运人列表")
+
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
             @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
@@ -157,24 +226,42 @@ public class RMScontroller {
 
     @PostMapping("/getShipperList")
     public Map<String, Object> getShipperList(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                Integer apiId,
-                                                Integer pageNum,
-                                                Integer pageSize
+                                              Integer apiId,
+                                              Integer pageNum,
+                                              Integer pageSize,
+                                              String con
     ){
-        return   rmsFeign.getShipperList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
+        return   rmsFeign.getShipperList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize,con);
     }
-    @ApiOperation(value="新增人员信息", notes="根据rmsShipper对象创建")
+
+    @ApiOperation(value="新增托运人信息", notes="根据rmsShipper对象创建")
     @ApiImplicitParam(name = "rmsShipper", value = "详细实体rmsShipper", required = true, dataType = "rmsShipper")
     @PostMapping(value = "/insertShipper")
     public Map<String, Object> insertShipper(@RequestBody(required = false) Map<String, Object> map){
         return rmsFeign.insertShipper(map);
     }
-    @ApiOperation(value="删除", notes="根据rmsCarrier对象创建")
-    @ApiImplicitParam(name = "承运商id", value = "id", required = true, dataType = "int")
+
+
+    @ApiImplicitParam(name = "托运人id", value = "id", required = true, dataType = "int")
     @PostMapping(value = "/deleteShipper/{id}")
     public Map<String, Object> deleteShipper(@PathVariable("id")BigDecimal id){
         return rmsFeign.deleteShipper(id);
     }
+
+    @ApiOperation(value="更新托运人信息", notes="根据rmsShipper对象创建")
+    @ApiImplicitParam(name = "rmsShipper", value = "详细实体rmsShipper", required = true, dataType = "rmsShipper")
+    @PostMapping(value = "/updateShipper")
+    public Map<String, Object> updateShipper(@RequestBody(required = false) Map<String, Object> map){
+        return rmsFeign.updateShipper(map);
+    }
+    @ApiOperation(value="根据id查询详细托运人信息", notes="根据rmsShipper对象创建")
+    @ApiImplicitParam(name = "托运人id", value = "id", required = true, dataType = "int")
+    @PostMapping(value = "/getShipperById/{id}")
+    public Map<String, Object> getShipperById(@PathVariable("id")BigDecimal id){
+        return rmsFeign.getShipperById(id);
+    }
+//    获取供应商列表
+
     @ApiOperation(value="展示供应商信息")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
@@ -186,24 +273,39 @@ public class RMScontroller {
 
     @PostMapping("/getSupplierList")
     public Map<String, Object> getSupplierList(@RequestBody(required=false) Map<String,Object> mapValue,
-                                              Integer apiId,
-                                              Integer pageNum,
-                                              Integer pageSize
+                                               Integer apiId,
+                                               Integer pageNum,
+                                               Integer pageSize,
+                                               String con
     ){
-        return   rmsFeign.getSupplierList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
+        return   rmsFeign.getSupplierList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize,con);
     }
-    @ApiOperation(value="新增供应商信息", notes="根据rmsShipper对象创建")
+    @ApiOperation(value="新增供应商信息", notes="根据rmsSupplier对象创建")
     @ApiImplicitParam(name = "rmsSupplier", value = "详细实体rmsSupplier", required = true, dataType = "rmsSupplier")
     @PostMapping(value = "/insertSupplier")
     public Map<String, Object> insertSupplier(@RequestBody(required = false) Map<String, Object> map){
         return rmsFeign.insertSupplier(map);
     }
-    @ApiOperation(value="删除", notes="根据rmsCarrier对象创建")
+    @ApiOperation(value="删除", notes="根据rmsSupplier对象创建")
     @ApiImplicitParam(name = "承运商id", value = "id", required = true, dataType = "int")
     @PostMapping(value = "/deleteSupplier/{id}")
     public Map<String, Object> deleteSupplier(@PathVariable("id")BigDecimal id){
         return rmsFeign.deleteSupplier(id);
     }
+
+    @ApiOperation(value="更新供应商信息", notes="根据rmsSupplier对象创建")
+    @ApiImplicitParam(name = "rmsSupplier", value = "详细实体rmsSupplier", required = true, dataType = "rmsSupplier")
+    @PostMapping(value = "/updateSupplier")
+    public Map<String, Object> updateSupplier(@RequestBody(required = false) Map<String, Object> map){
+        return rmsFeign.updateSupplier(map);
+    }
+    @ApiOperation(value="根据id查询供应商信息", notes="根据rmsSupplier对象创建")
+    @ApiImplicitParam(name = "承运商id", value = "id", required = true, dataType = "int")
+    @PostMapping(value = "/getSupplierById/{id}")
+    public Map<String, Object> getSupplierById(@PathVariable("id")BigDecimal id){
+        return rmsFeign.getSupplierById(id);
+    }
+    //    展示运力信息
     @ApiOperation(value="展示运力信息")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
@@ -233,6 +335,35 @@ public class RMScontroller {
     public Map<String, Object> deleteCapacity(@PathVariable("id")BigDecimal id){
         return rmsFeign.deleteCapacity(id);
     }
+
+    @ApiOperation(value="获取运力详细信息", notes="根据url的id来获取详细信息")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal")
+    @PostMapping(value = "/getCapacityById/{id}")
+    public Map<String,Object> getCapacityById(@PathVariable("id")BigDecimal id){
+        return rmsFeign.getCapacityById(id);
+    }
+    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象，并根据传过来的rmsCapacity信息来更新详细信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "Short"),
+            @ApiImplicitParam(name = "rmsCapacity", value = "详细实体rmsCapacity", required = true, dataType = "RmsCapacity")
+    })
+    @PostMapping(value = "/updateCapacity", produces  = "application/json;charset=UTF-8")
+    public Map<String, Object> updateCapacity( @RequestBody Map<String, Object> map){
+
+        return rmsFeign.updateCapacity(map);
+    }
+    @PostMapping("/getCapacityResultList")
+    @ApiOperation(value = "模糊查询运力")
+    public Map<String, Object> getCapacityResultList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                     Integer pageNum,
+                                                     Integer pageSize,
+                                                     Integer apiId,
+                                                     String con) {
+
+        return rmsFeign.getCapacityResultList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
+    }
+
+
     @ApiOperation(value="展示汽车衡列表")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
@@ -243,9 +374,9 @@ public class RMScontroller {
     })
     @PostMapping("/getTruckCalculateList")
     public Map<String, Object> getTruckCalculateList(@RequestBody(required=false) Map<String,Object> mapValue,
-                                               Integer apiId,
-                                               Integer pageNum,
-                                               Integer pageSize
+                                                     Integer apiId,
+                                                     Integer pageNum,
+                                                     Integer pageSize
     ){
         return   rmsFeign.getTruckCalculateList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
     }
@@ -261,7 +392,39 @@ public class RMScontroller {
     public Map<String, Object> deleteTruckCalculate(@PathVariable("id")BigDecimal id){
         return rmsFeign.deleteTruckCalculate(id);
     }
-    @ApiOperation(value="展示原料信息", notes="分页查询")
+
+    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象，并根据传过来的rmsCarDriver信息来更新详细信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal"),
+            @ApiImplicitParam(name = "rmsTruckCalculate", value = "详细实体rmsTruckCalculate", required = true, dataType = "RmsTruckCalculate")
+    })
+    @PostMapping(value = "/updateTruckCalculate", produces  = "application/json;charset=UTF-8")
+    public Map<String, Object> updateTruckCalculate(@RequestBody Map<String, Object> map){
+        return rmsFeign.updateTruckCalculate(map);
+    }
+
+    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal")
+    @PostMapping(value = "/getTruckCalculateById/{id}")
+    public Map<String,Object> getTruckCalculateById(@PathVariable("id") BigDecimal id){
+        return rmsFeign.getTruckCalculateById(id);
+    }
+
+
+    @PostMapping("/getTruckCalculateResultList")
+    @ApiOperation(value = "模糊查询汽车衡")
+    public Map<String, Object> getTruckCalculateResultList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                           Integer pageNum,
+                                                           Integer pageSize,
+                                                           Integer apiId,
+                                                           String con) {
+
+        return rmsFeign.getTruckCalculateResultList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
+    }
+
+
+    @ApiOperation(value="展示原料仓库信息", notes="分页查询")
+
     @ApiImplicitParams({
             @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
@@ -269,14 +432,17 @@ public class RMScontroller {
     })
     @PostMapping(value = "/getWarehouseList")
     public Map<String, Object> getWarehouseList(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                     Integer apiId,
-                                                     Integer pageNum,
-                                                     Integer pageSize
+                                                Integer apiId,
+                                                Integer pageNum,
+                                                Integer pageSize
     ){
         return   rmsFeign.getWarehouseList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
     }
+
+
     @ApiOperation(value="新增汽车衡信息", notes="根据rmsWarehouse对象创建")
     @ApiImplicitParam(name = "rmsWarehouse", value = "详细实体rmsWarehouse", required = true, dataType = "rmsWarehouse")
+
     @PostMapping(value = "/insertWarehouse")
     public Map<String, Object> insertWarehouse(@RequestBody(required = false) Map<String, Object> map){
         return rmsFeign.insertWarehouse(map);
@@ -287,11 +453,147 @@ public class RMScontroller {
     public Map<String, Object> deleteWarehouse(@PathVariable("id")BigDecimal id){
         return rmsFeign.deleteWarehouse(id);
     }
+
+    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象，并根据传过来的rmsCarDriver信息来更新详细信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal"),
+            @ApiImplicitParam(name = "rmsWarehouse", value = "详细实体rmsWarehouse", required = true, dataType = "RmsWarehouse")
+    })
+    @PostMapping(value = "/updateWarehouse", produces  = "application/json;charset=UTF-8")
+    public Map<String, Object> updateWarehouse( @RequestBody Map<String, Object> map){
+        return rmsFeign.updateWarehouse(map);
+    }
+    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal")
+    @PostMapping(value = "/getWarehouseById/{id}")
+    public Map<String, Object> getWarehouseById(@PathVariable("id") BigDecimal id){
+        return rmsFeign.getWarehouseById(id);
+    }
+
+    @PostMapping("/getWarehouseResultList")
+    @ApiOperation(value = "模糊查询原料仓库")
+    public Map<String, Object> getWarehouseResultList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                      Integer pageNum,
+                                                      Integer pageSize,
+                                                      Integer apiId,
+                                                      String con) {
+
+        return rmsFeign.getWarehouseResultList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
+    }
+    @ApiOperation(value="展示司机排班信息", notes="分页查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "196", required = false, dataType = "BigDecimal"),
+    })
+    @PostMapping(value = "/getDriverCapacityList")
+    public Map<String, Object> getDriverCapacityList(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                     Integer pageNum,
+                                                     Integer pageSize,
+                                                     Integer apiId){
+        return rmsFeign.getDriverCapacityList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
+    }
+
+    @ApiOperation(value="创建", notes="根据RmsDriverCapacity对象创建")
+    @ApiImplicitParam(name = "rmsDriverCapacity", value = "详细实体rmsDriverCapacity", required = true, dataType = "RmsDriverCapacity")
+    @PostMapping(value = "/insertDriverCapacity")
+    public Map<String, Object> insertDriverCapacity(@RequestBody(required = false) Map<String, Object> map ){
+        return rmsFeign.insertDriverCapacity(map);
+    }
+
+
+    @ApiOperation(value="展示门岗信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+    })
+
+    @PostMapping("/getGatepostList")
+    public Map<String, Object> getGatepostList(@RequestBody(required=false) Map<String,Object> mapValue,
+                                               Integer apiId,
+                                               Integer pageNum,
+                                               Integer pageSize,
+                                               String con
+    ){
+        return   rmsFeign.getGatepostList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize,con);
+    }
+    @ApiOperation(value="新增门岗信息", notes="根据rmsGatepost对象创建")
+    @ApiImplicitParam(name = "rmsGatepost", value = "详细实体rmsGatepost", required = true, dataType = "rmsGatepost")
+    @PostMapping(value = "/insertGatepost")
+    public Map<String, Object> insertGatepost(@RequestBody(required = false) Map<String, Object> map){
+        return rmsFeign.insertGatepost(map);
+    }
+    @ApiOperation(value="删除", notes="根据rmsGatepost对象创建")
+    @ApiImplicitParam(name = "门岗id", value = "id", required = true, dataType = "int")
+    @PostMapping(value = "/deleteGatepost/{id}")
+    public Map<String, Object> deleteGatepost(@PathVariable("id")BigDecimal id){
+        return rmsFeign.deleteGatepost(id);
+    }
+
+    @ApiOperation(value="更新门岗信息", notes="根据rmsGatepost对象创建")
+    @ApiImplicitParam(name = "rmsGatepost", value = "详细实体rmsGatepost", required = true, dataType = "rmsGatepost")
+    @PostMapping(value = "/updateGatepost")
+    public Map<String, Object> updateGatepost(@RequestBody(required = false) Map<String, Object> map){
+        return rmsFeign.updateGatepost(map);
+    }
+    @ApiOperation(value="根据id查询门岗规则信息", notes="根据rmsGatepost对象创建")
+    @ApiImplicitParam(name = "门岗id", value = "id", required = true, dataType = "int")
+    @PostMapping(value = "/getGatepostById/{id}")
+    public Map<String, Object> getGatepostById(@PathVariable("id")BigDecimal id){
+        return rmsFeign.getGatepostById(id);
+    }
+
+
     //*******************************下拉框************************
-    @GetMapping("getCapacityId")
+    @GetMapping("getCapacityTypeId")
     @ApiOperation(value = "得到下拉运力id")
-    public Map<String, Object> getCapacityId() {
-        return rmsFeign.getCapacityId();
+    public Map<String, Object> getCapacityTypeId() {
+        return rmsFeign.getCapacityTypeId();
+    }
+
+    @GetMapping(value = "getWarehouseTypeId")
+    @ApiOperation(value = "获取原料仓库类型下拉id")
+    public Map<String, Object> getWarehouseTypeId(){
+        return rmsFeign.getWarehouseTypeId();
+    }
+
+    @GetMapping(value = "getPortId")
+    @ApiOperation(value = "获取港存库所属港口下拉id")
+    public Map<String, Object> getPortId(){
+        return rmsFeign.getPortId();
+    }
+
+    @GetMapping(value="getCarrierId")
+    @ApiOperation(value = "获取承运商下拉id")
+    public Map<String,Object> getCarrierId(){
+        return rmsFeign.getCarrierId();
+    }
+
+    @GetMapping("getMaterialTypeId")
+    @ApiOperation(value = "得到下拉物资类型id")
+    public Map<String, Object> getMaterialTypeId() {
+        return rmsFeign.getMaterialTypeId();
+    }
+
+    @GetMapping("getUnitOfMeasureId")
+    @ApiOperation(value = "得到下拉计量id")
+    public Map<String, Object> getUnitOfMeasureId() {
+        return rmsFeign.getUnitOfMeasureId();
+    }
+
+    @GetMapping("getShipperId")
+    @ApiOperation(value = "得到下拉托运人id")
+    public Map<String, Object> getShipperId() {
+        return rmsFeign.getShipperId();
+    }
+
+    @GetMapping("getGatepostRulesId")
+    @ApiOperation(value = "得到下拉门岗规则id")
+    public Map<String, Object> getGatepostRulesId() {
+        return rmsFeign.getGatepostRulesId();
     }
 
     /**
@@ -329,8 +631,9 @@ public class RMScontroller {
                                         Integer pageNum,
                                         Integer pageSize,
                                         Integer apiId,
-                                        String con){
-        return rmsFeign.getAllLineDesk(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId, con);
+                                        String con,
+                                              Integer lineType){
+        return rmsFeign.getAllLineDesk(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId ,con,lineType);
     }
 
     @ApiOperation(value = "根据主键查询出数据以供修改")

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

@@ -1771,4 +1771,14 @@ public class TMSController extends BaseRESTfulController {
     public Map<String, Object> addSteelNzReceiptResult(@RequestBody(required = false) Map<String, Object> map) {
         return tmsTruckFeign.addSteelNzReceiptResult(map);
     }
+
+
+    @ApiOperation(value="更新计量实绩 ")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapList", value = "计量数据", required = false, dataType = "List<Map>"),
+    })
+    @PostMapping("/updateTruckWeight")
+    public Map<String, Object> updateTruckWeight(@RequestBody List<Map<String, Object>> mapList){
+        return tmsTruckFeign.updateTruckWeight(mapList);
+    }
 }

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

@@ -50,67 +50,67 @@ public class UniversalController extends BaseRESTfulController {
         return success(tiHuoDan);
     }
 
-    @ApiModelProperty(value = "模糊查询物资")
+
+    @ApiModelProperty(value = "模糊查询发货单位")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "apiId", value = "244", required = false, dataType = "BigDecimal")
+            @ApiImplicitParam(name = "apiId", value = "247", required = false, dataType = "BigDecimal")
     })
-    @PostMapping("/queryMaterialByLike")
-    public RESTfulResult queryMaterialByLike(@RequestBody(required = false) Map<String,Object> mapValue,
-                                           Integer pageNum,
-                                           Integer pageSize,
-                                           Integer apiId,
-                                           String index) {
-
+    @PostMapping("/querySupplierByLike")
+    public RESTfulResult querySupplierByLike(@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 + "%");
-        }else {
-            mapValue.put("index", "aaaaa%");
+            mapValue.put("index","%" + index + "%");
         }
-        List<Map<String, Object>> list = universalMapper.queryMaterialByLike(mapValue);
+        List<Map<String, Object>> list = universalMapper.querySupplierByLike(mapValue);
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
-        List<Map<String, Object>> columnList = universalMapper.queryMaterialByLike(mapValue);
+        List<Map<String, Object>> columnList = universalMapper.querySupplierByLike(mapValue);
         PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
         return success(data);
     }
 
-    @ApiModelProperty(value = "模糊查询发货单位")
+    @ApiModelProperty(value = "通过物资ID查询该物资的发货单位信息")
     @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("/querySupplierByLike")
-    public RESTfulResult querySupplierByLike(@RequestBody(required = false) Map<String,Object> mapValue,
+    @PostMapping("/getSupplierMesByMaterialId")
+    public RESTfulResult getSupplierMesByMaterialId(@RequestBody(required = false) Map<String,Object> mapValue,
                                              Integer pageNum,
                                              Integer pageSize,
                                              Integer apiId,
-                                             String index) {
-        if(mapValue == null) {
+                                             String index, String materialId) {
+        if(mapValue == null)
             mapValue = new HashMap<>();
-        }
+
+        if(!"null".equals(materialId))
+            mapValue.put("materialId",materialId);
+
         if(index != null){
-            mapValue.put("index", index + "%");
-        }else {
-            mapValue.put("index", "aaaaa%");
+            mapValue.put("index","%" + index + "%");
         }
-        List<Map<String, Object>> list = universalMapper.querySupplierByLike(mapValue);
+        List<Map<String, Object>> list = universalMapper.getSupplierMesByMaterialId(mapValue);
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
-        List<Map<String, Object>> columnList = universalMapper.querySupplierByLike(mapValue);
+        List<Map<String, Object>> columnList = universalMapper.getSupplierMesByMaterialId(mapValue);
         PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
         return success(data);
     }
 
+
     @ApiOperation(value="查询所有空闲的运力信息")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(248)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
     })
@@ -126,8 +126,6 @@ public class UniversalController extends BaseRESTfulController {
         }
         if(index != null){
             mapValue.put("index", index + "%");
-        }else {
-            mapValue.put("index", "aaaaaa%");
         }
         //不分页筛选数据
         List<Map<String, Object>> allCapacity = universalMapper.getAllCapacityByCarrierLike(mapValue);
@@ -167,4 +165,94 @@ public class UniversalController extends BaseRESTfulController {
         PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allCapacity,capacity);
         return success(pageList);
     }
+
+    @ApiModelProperty(value = "模糊查询物资")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "244", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping("/queryAPOMaterialByLike")
+    public RESTfulResult queryMaterialByLike(@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.queryAPOMaterialByLike(mapValue);
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList = universalMapper.queryAPOMaterialByLike(mapValue);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        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 = "374", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping("/getUnloadingMesByLike")
+    public RESTfulResult getUnloadingMesByLike(@RequestBody(required = false) Map<String,Object> mapValue,
+                                             Integer pageNum,
+                                             Integer pageSize,
+                                             Integer apiId,
+                                             Integer type,
+                                             String index) {
+
+        if(mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        if(type != null){
+            mapValue.put("type", type);
+        }
+        if(index != null){
+            mapValue.put("index", "%" + index + "%");
+        }
+        List<Map<String, Object>> list = universalMapper.getUnloadingMesByLike(mapValue);
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList = universalMapper.getUnloadingMesByLike(mapValue);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        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 = "244", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping("/queryMaterialByLike")
+    public RESTfulResult queryMaterialByLike(@RequestBody(required = false) Map<String,Object> mapValue,
+                                             Integer pageNum,
+                                             Integer pageSize,
+                                             Integer apiId,
+                                             String index,
+                                             String startNum) {
+
+        if(mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        if(startNum != null){
+            mapValue.put("startNum", startNum + "%");
+        }
+        if(index != null){
+            mapValue.put("index", "%" + index + "%");
+        }
+        List<Map<String, Object>> list = universalMapper.queryMaterialByLike(mapValue);
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList = universalMapper.queryMaterialByLike(mapValue);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        return success(data);
+    }
 }

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

@@ -62,12 +62,22 @@ public class WMSController extends BaseRESTfulController {
         return resTfulResult;
     }
 
-    @PostMapping("/insertWmspOutboundScanResult")
-    public Map<String, Object> insertWmspOutboundScanResult(@RequestBody(required = false) Map<String, Object> mapval) {
-        Map<String, Object> resTfulResult = wmsFeign.insertWmspOutboundScanResult(mapval);
+    @PostMapping(value = "/deletewmspOutboundResult")
+    public Map<String,Object> deleteWmspOutboundResult(@RequestParam Integer resultId){
+        return wmsFeign.deleteWmspOutboundResult(resultId);
+    }
+
+    @PostMapping("/insertwmspOutboundScanResult")
+    public Map<String, Object> insertwmspOutboundScanResult(@RequestBody(required = false) Map<String, Object> map) {
+        Map<String, Object> resTfulResult = wmsFeign.insertwmspOutboundScanResult(map);
         return resTfulResult;
     }
 
+    @PostMapping("/outbountResultToSuccess")
+    public Map<String,Object> outbountResultToSuccess(@RequestParam Integer resultId){
+        return wmsFeign.outbountResultToSuccess(resultId);
+    }
+
     @PostMapping("/updataResultStatus")
     public Map<String, Object> updataResultStatus(@RequestParam Integer resultId) {
         Map<String, Object> resTfulResult = wmsFeign.updataResultStatus(resultId);
@@ -95,6 +105,7 @@ public class WMSController extends BaseRESTfulController {
 
     }
 
+
     //通过成品仓库网格ID查询实时库存数据
     @PostMapping("/selectGridMaterialListByGridId")
     @ApiOperation(value = "通过成品仓库网格ID展示实时库存数据")
@@ -522,7 +533,7 @@ public class WMSController extends BaseRESTfulController {
     @ApiOperation("新增入库实绩")
     @PostMapping("/insertInboundResult")
     @Transactional
-    public String addInvoice(@RequestBody List<Map<String, Object>> mapList) {
+    public Map<String,Object> addInvoice(@RequestBody List<Map<String, Object>> mapList) {
         /*
         获取入库物资件数
          */
@@ -530,15 +541,15 @@ public class WMSController extends BaseRESTfulController {
         /*
         获取入库垛位
          */
-        Map<String, Object> map1 = qmsFeign.getStackingId(new BigDecimal(1), size);
-        String stackNo = (String) map1.get("stackNo");
-        BigDecimal stackId = new BigDecimal(map1.get("stackId").toString());
-        for (Map<String, Object> map : mapList
-        ) {
-            map.put("stackingId", stackId);
-        }
-        wmsFeign.insertInboundResult(mapList);
-        return stackNo;
+//        Map<String, Object> map1 = qmsFeign.getStackingId(new BigDecimal(1), size);
+//        String stackNo = (String) map1.get("stackNo");
+//        BigDecimal stackId = new BigDecimal(map1.get("stackId").toString());
+//        for (Map<String, Object> map : mapList
+//        ) {
+//            map.put("stackingId", stackId);
+//        }
+
+        return wmsFeign.insertInboundResult(mapList);
     }
 
     /**
@@ -675,4 +686,72 @@ public class WMSController extends BaseRESTfulController {
         return wmsFeign.updateInstruction(map);
     }
 
+    @PostMapping("/selectScanResultByIboundResultId")
+    @ApiOperation(value = "根据入库实绩id获得扫描实绩数据")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId", value = "", required = false, dataType = "BigDecimal"),
+    })
+    public RESTfulResult selectScanResultByIboundResultId(Map<String, Object> mapValue,
+                                                          Integer apiId,
+                                                          Integer pageNum,
+                                                          Integer pageSize) {
+        return wmsFeign.selectScanResultByIboundResultId(mapValue, apiId, pageNum, pageSize);
+    }
+
+    @PostMapping("/getIvboundMakeResultList")
+    @ApiOperation(value = "展示倒库列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId", value = "372", required = false, dataType = "BigDecimal"),
+    })
+    public RESTfulResult getIvboundMakeResultList(Map<String, Object> mapValue,
+                                                          Integer pageNum,
+                                                          Integer pageSize,
+                                                  Integer apiId,
+                                                  String con) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return wmsFeign.getIvboundMakeResultList(mapValue, pageNum, pageSize, apiId, con);
+    }
+
+    /**
+     * 新增倒库作业
+     * @param mapValue
+     * @return
+     */
+    @PostMapping(value = "/addIvboundMakeResult")
+    public Map<String,Object> addIvboundMakeResult(@RequestBody Map<String,Object> mapValue) {
+        return wmsFeign.addIvboundMakeResult(mapValue);
+    }
+
+    /**
+     * 逻辑删除倒库作业
+     * @param resultId
+     * @return
+     */
+    @PostMapping(value = "/deleteIvboundMakeResult/{resultId}")
+    public Map<String,Object> deleteIvboundMakeResult(@PathVariable("resultId") Integer resultId) {
+        return wmsFeign.deleteIvboundMakeResult(resultId);
+    }
+
+    /**
+     * 查询倒库作业
+     * @param resultId
+     * @return
+     */
+    @PostMapping(value = "/selectIvboundMakeResult/{resultId}")
+    public List<Map<String,Object>> selectIvboundMakeResult(@PathVariable("resultId") Integer resultId) {
+        return wmsFeign.selectIvboundMakeResult(resultId);
+    }
+
+    /**
+     * 修改倒库作业
+     * @param mapValue
+     * @return
+     */
+    @PostMapping(value = "/updateIvboundMakeResult")
+    public Map<String,Object> updateIvboundMakeResult(@RequestBody Map<String,Object> mapValue) {
+        return wmsFeign.updateIvboundMakeResult(mapValue);
+    }
+
 }

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

@@ -1156,12 +1156,12 @@ public interface AmsFeign {
     @PostMapping(value = "/api/v1/ams/amsdispatchsaleorders/getLockDispatchSaleOrderList")
     Map<String, Object> getLockDispatchSaleOrderList(@RequestParam Integer carrierId);
 
-    @PostMapping("/api/v1/ams/amssaleplans/getAllSteelMaterialMes")
-    public Map<String, Object> getAllSteelMaterialMes(@RequestBody(required = false) Map<String,Object> mapValue,
-                                                      @RequestParam Integer pageNum,
-                                                      @RequestParam Integer pageSize,
-                                                      @RequestParam Integer apiId,
-                                                      @RequestParam String con) ;
+//    @PostMapping("/api/v1/ams/amssaleplans/getAllSteelMaterialMes")
+//    public Map<String, Object> getAllSteelMaterialMes(@RequestBody(required = false) Map<String,Object> mapValue,
+//                                                      @RequestParam Integer pageNum,
+//                                                      @RequestParam Integer pageSize,
+//                                                      @RequestParam Integer apiId,
+//                                                      @RequestParam String con) ;
 
     @PostMapping("/api/v1/ams/amsdispatchsaleorders/getPCDispatchSaleOrderList")
     Map<String, Object> getPCDispatchSaleOrderList(@RequestBody(required = false) Map<String,Object> mapValue,
@@ -1231,4 +1231,7 @@ public interface AmsFeign {
                                              @RequestParam Integer pageSize,
                                              @RequestParam Integer apiId,
                                              @RequestParam Integer dayPlanId);
+
+    @PostMapping("/api/v1/ams/amstruckinwardplan/finishTruckPlan/{planId}")
+    public Map<String, Object> finishTruckPlan(@PathVariable("planId") Integer planId);
 }

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

@@ -278,7 +278,7 @@ public interface OmsFeign {
     @PostMapping(value = "api/v1/oms/omstruckorders/closeOmstruckOrder")
     Map<String, Object> closeOmstruckOrder(@RequestParam Integer orderId);
 
-    @ApiOperation(value="根据运单id关闭订单")
+    @ApiOperation(value="车牌")
     @PostMapping(value = "api/v1/oms/omstruckorders/getCapacityAndDriverList")
     Map<String, Object> getCapacityAndDriverList(@RequestBody(required=false) Map<String,Object> mapValue,
                                                  @RequestParam Integer apiId,
@@ -317,5 +317,28 @@ public interface OmsFeign {
     // 司机APP端查询下发给自己运输订单
     @PostMapping("api/v1/oms/omstruckorders/sendOrderToApp")
     List<Map<String,Object>> sendOrderToApp(@RequestParam String capacityNumber);
+
+    //分解异地库计划
+    @PostMapping("api/v1/oms/omstruckorders/apportionInwardOffsetOrder")
+    Map<String, Object> apportionInwardOffsetOrder(@RequestBody Map<String, Object> mapvalue);
+
+    @ApiOperation(value = "查询司机的所有运输订单信息")
+    @PostMapping("api/v1/oms/omstruckorders/getAllOrderMessage")
+    List<Map<String,Object>> getAllOrderMessage(@RequestParam String capacityNumber);
+    @PostMapping("api/v1/oms/omstruckorders/driverConfirmation")
+    Map<String,Object> driverConfirmation(@RequestBody(required = false) Map<String,Object> mapvalue);
+
+    @PostMapping("api/v1/oms/omstruckorders/getMessageToApp")
+    Map<String, Object> getMessageToApp(@RequestBody(required = false) Map<String,Object> mapvalue) ;
+
+    @PostMapping("api/v1/oms/omstruckorders/getAllOrderMessagesByCapacityNum")
+    List<Map<String, Object>> getAllOrderMessagesByCapacityNum(@RequestBody(required = false) Map<String,Object> mapvalue);
+
+    @PostMapping("api/v1/oms/omstruckorders/getReceiveOrderIdListByCapacityNum")
+    List<Integer> getReceiveOrderIdListByCapacityNum(@RequestBody(required = false) Map<String,Object> mapvalue);
+
+    @ApiOperation(value = "通过车牌号查询该车牌下所有已接收的订单ID")
+    @PostMapping("api/v1/oms/omstruckorders/getAllRefuseOrderNumberByCapacity")
+    List<Map<String, Object>> getAllRefuseOrderNumberByCapacity(@RequestBody(required = false) Map<String,Object> mapvalue);
 }
 

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

@@ -15,85 +15,135 @@ public interface RmsFeign {
     @PostMapping(value = "api/v1/rms/rmscardriver/getCarDriverList")
     Map<String,Object> getCarDriverList  (@RequestBody(required = false) Map<String, Object> mapValue,
                                           @RequestParam("apiId") Integer apiId,
-                                           @RequestParam("pageNum") Integer pageNum,
-                                           @RequestParam("pageSize") Integer pageSize
+                                          @RequestParam("pageNum") Integer pageNum,
+                                          @RequestParam("pageSize") Integer pageSize
 
-                                           );
+    );
     //新增司机信息
     @PostMapping(value = "api/v1/rms/rmscardriver/insertCarDriver")
     Map<String, Object> insertCarDriver(@RequestBody(required = false) Map<String, Object> map);
+
+    //修改司机信息
+    @PostMapping(value = "api/v1/rms/rmscardriver/updateCarDriver")
+    Map<String, Object> updateCarDriver(Map<String, Object> map);
+    //通过id查询司机信息
+    @PostMapping(value = "api/v1/rms/rmscardriver/getCarDriverById/{id}")
+    Map<String, Object> getCarDriverById(@PathVariable("id") BigDecimal id);
     //删除司机信息
     @PostMapping(value = "api/v1/rms/rmscardriver/deleteCarDriver/{id}")
     Map<String, Object> deleteCarDriver(@PathVariable("id") BigDecimal id);
-    //获取托运人列表
+    //模糊查询司机
+    @PostMapping(value = "/api/v1/rms/rmscardriver/getCarDriverResultList")
+    Map<String, Object> getCarDriverResultList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                               @RequestParam("pageNum") Integer pageNum,
+                                               @RequestParam("pageSize") Integer pageSize,
+                                               @RequestParam("apiId") Integer apiId,
+                                               @RequestParam("con") String con);
+
+
+    //获取承运商列表
     @PostMapping(value = "api/v1/rms/rmscarriers/getCarrierList")
-    Map<String,Object>     getCarrierList(@RequestBody(required = false) Map<String, Object> mapValue,
+    Map<String,Object>     getCarrierList(@RequestBody(required = false) Map<String,Object> mapValue,
                                           @RequestParam("apiId") Integer apiId,
                                           @RequestParam("pageNum") Integer pageNum,
-                                          @RequestParam("pageSize") Integer pageSize
+                                          @RequestParam("pageSize") Integer pageSize,
+                                          @RequestParam String con);
 
-    );
-    //新增托运人
-    @PostMapping(value = "api/v1/rms/rmscardriver/insertCarrier")
-    Map<String, Object> insertCarrier(@RequestBody(required = false) Map<String, Object> map);
-    //删除托运人
-    @PostMapping(value = "api/v1/rms/rmscardriver/deleteCarrier/{id}")
+    //新增承运商
+    @PostMapping(value = "api/v1/rms/rmscarriers/insertCarrier")
+    Map<String,Object> insertCarrier(@RequestBody(required = false) Map<String,Object> map);
+    //删除承运商
+    @PostMapping(value = "api/v1/rms/rmscarriers/deleteCarrier/{id}")
     Map<String, Object> deleteCarrier(@PathVariable("id") BigDecimal id);
+    //    更新承运商信息
+    @PostMapping(value = "api/v1/rms/rmscarriers/updateCarrier")
+    Map<String, Object> updateCarrier(@RequestBody(required = false) Map<String, Object> map);
+    //    根据id获取承运商信息
+    @PostMapping(value = "api/v1/rms/rmscarriers/getCarrierById/{id}")
+    Map<String, Object> getCarrierById(@PathVariable("id") BigDecimal id);
+
     //获取物资列表
     @PostMapping(value = "api/v1/rms/rmsmaterial/getMaterialList")
-    Map<String,Object>     getMaterialList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                           @RequestParam("apiId") Integer apiId,
-                                          @RequestParam("pageNum") Integer pageNum,
-                                          @RequestParam("pageSize") Integer pageSize
-
-    );
+    Map<String,Object> getMaterialList(@RequestBody(required = false) Map<String,Object> mapValue,
+                                       @RequestParam("apiId") Integer apiId,
+                                       @RequestParam("pageNum") Integer pageNum,
+                                       @RequestParam("pageSize") Integer pageSize,
+                                       @RequestParam String con);
     //新增物资
     @PostMapping(value = "api/v1/rms/rmsmaterial/insertMaterial")
     Map<String, Object> insertMaterial(@RequestBody(required = false) Map<String, Object> map);
     //删除物资
-    @PostMapping(value = "api/v1/rms/rmscardriver/deleteMaterial/{id}")
+    @PostMapping(value = "api/v1/rms/rmsmaterial/deleteMaterial/{id}")
     Map<String, Object> deleteMaterial(@PathVariable("id") BigDecimal id);
-    //获得人员列表
-    @PostMapping(value = "api/v1/rms/rmspersonnel/getPersonnelList")
-    Map<String,Object>   getPersonnelList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                          @RequestParam("apiId") Integer apiId,
-                                          @RequestParam("pageNum") Integer pageNum,
-                                          @RequestParam("pageSize") Integer pageSize
+    //    更新物资信息
+    @PostMapping(value = "api/v1/rms/rmsmaterial/updateMaterial")
+    Map<String, Object> updateMaterial(@RequestBody(required = false) Map<String, Object> map);
+    //    根据id获取物资信息
+    @PostMapping(value = "api/v1/rms/rmsmaterial/getMaterialById/{id}")
+    Map<String, Object> getMaterialById(@PathVariable("id") BigDecimal id);
+
 
-    );
     @PostMapping(value = "api/v1/rms/rmspersonnel/insertPersonnel")
     Map<String, Object> insertPersonnel(@RequestBody(required = false) Map<String, Object> map);
     //删除人员信息
     @PostMapping(value = "api/v1/rms/rmspersonnel/deletePersonnel/{id}")
     Map<String, Object> deletePersonnel(@PathVariable("id") BigDecimal id);
-    //获得承运商列表
+    //    更新人员信息
+    @PostMapping(value = "api/v1/rms/rmspersonnel/updatePersonnel")
+    Map<String, Object> updatePersonnel(@RequestBody(required = false) Map<String, Object> map);
+    //    根据id获取人员信息
+    @PostMapping(value = "api/v1/rms/rmspersonnel/getPersonnelById/{personnelId}")
+    Map<String, Object> getPersonnelById(@PathVariable("personnelId") BigDecimal personnelId);
+    //    模糊查询人员信息
+    @PostMapping(value = "/api/v1/rms/rmspersonnel/getPersonnelList")
+    Map<String, Object> getPersonnelList(@RequestBody(required = false) Map<String,Object> mapVal,
+                                         @RequestParam("apiId")Integer apiId,
+                                         @RequestParam("pageNum") Integer pageNum,
+                                         @RequestParam("pageSize") Integer pageSize,
+                                         @RequestParam("con") String con);
+
+
+    //获得托运人列表
     @PostMapping(value = "api/v1/rms/rmsshippers/getShipperList")
-    Map<String,Object>   getShipperList (@RequestBody(required = false) Map<String, Object> mapValue,
+    Map<String,Object>   getShipperList (@RequestBody(required = false) Map<String,Object> mapValue,
                                          @RequestParam("apiId") Integer apiId,
-                                          @RequestParam("pageNum") Integer pageNum,
-                                          @RequestParam("pageSize") Integer pageSize
-
-    );
-    //新增承运商信息
+                                         @RequestParam("pageNum") Integer pageNum,
+                                         @RequestParam("pageSize") Integer pageSize,
+                                         @RequestParam String con);
+    //新增托运人信息
     @PostMapping(value = "api/v1/rms/rmsshippers/insertShipper")
     Map<String, Object> insertShipper(@RequestBody(required = false) Map<String, Object> map);
-    //删除承运商
+    //删除托运人
     @PostMapping(value = "api/v1/rms/rmsshippers/deleteShipper/{id}")
     Map<String, Object> deleteShipper(@PathVariable("id") BigDecimal id);
+    //修改托运人信息
+    @PostMapping(value = "api/v1/rms/rmsshippers/updateShipper")
+    Map<String, Object> updateShipper(@RequestBody(required = false) Map<String, Object> map);
+    //根据id获取托运人信息
+    @PostMapping(value = "api/v1/rms/rmsshippers/getShipperById/{id}")
+    Map<String, Object> getShipperById(@PathVariable("id") BigDecimal id);
+
     //展示供应商列表
     @PostMapping(value = "api/v1/rms/rmssupplier/getSupplierList")
-    Map<String,Object>   getSupplierList (@RequestBody(required = false) Map<String, Object> mapValue,
+    Map<String,Object>   getSupplierList (@RequestBody(required = false) Map<String,Object> mapValue,
                                           @RequestParam("apiId") Integer apiId,
                                           @RequestParam("pageNum") Integer pageNum,
-                                          @RequestParam("pageSize") Integer pageSize
-
-    );
+                                          @RequestParam("pageSize") Integer pageSize,
+                                          @RequestParam("con") String con);
     //新增供应商信息
-    @PostMapping(value = "api/v1/rms/rmsshippers/insertSupplier")
+    @PostMapping(value = "api/v1/rms/rmssupplier/insertSupplier")
     Map<String, Object> insertSupplier(@RequestBody(required = false) Map<String, Object> map);
-    //删除承运商
-    @PostMapping(value = "api/v1/rms/rmsshippers/deleteSupplier/{id}")
+    //删除供应商
+    @PostMapping(value = "api/v1/rms/rmssupplier/deleteSupplier/{id}")
     Map<String, Object> deleteSupplier(@PathVariable("id") BigDecimal id);
+    //    更新供应商信息
+    @PostMapping(value = "api/v1/rms/rmssupplier/updateSupplier")
+    Map<String, Object> updateSupplier(@RequestBody(required = false) Map<String, Object> map);
+    //    根据id获取供应商信息
+    @PostMapping(value = "api/v1/rms/rmssupplier/getSupplierById/{id}")
+    Map<String, Object> getSupplierById(@PathVariable("id") BigDecimal id);
+
+    //    获取运力列表
     @PostMapping(value = "api/v1/rms/rmscapacity/getCapacityList")
     Map<String,Object>   getCapacityList (@RequestBody(required = false) Map<String, Object> mapValue,
                                           @RequestParam("apiId") Integer apiId,
@@ -107,6 +157,24 @@ public interface RmsFeign {
     //删除运力
     @PostMapping(value = "api/v1/rms/rmscapacity/deleteCapacity/{id}")
     Map<String, Object> deleteCapacity(@PathVariable("id") BigDecimal id);
+    //修改运力
+    @PostMapping(value = "api/v1/rms/rmscapacity/updateCapacity")
+    Map<String, Object> updateCapacity(Map<String, Object> map);
+
+
+    //模糊查询运力
+    @PostMapping(value = "/api/v1/rms/rmscapacity/getCapacityResultList")
+    Map<String, Object> getCapacityResultList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                              @RequestParam Integer pageNum,
+                                              @RequestParam Integer pageSize,
+                                              @RequestParam Integer apiId,
+                                              @RequestParam String con);
+
+    //根据id获取运力详细信息
+    @PostMapping(value = "api/v1/rms/rmscapacity/getCapacityById/{id}")
+    Map<String,Object> getCapacityById(@PathVariable("id") BigDecimal id);
+
+
     //查找汽车衡列表
     @PostMapping(value = "api/v1/rms/rmstruckcalculate/getTruckCalculateList")
     Map<String,Object>   getTruckCalculateList (@RequestBody(required = false) Map<String, Object> mapValue,
@@ -117,10 +185,26 @@ public interface RmsFeign {
     //新增汽车衡
     @PostMapping(value = "api/v1/rms/rmstruckcalculate/insertTruckCalculate")
     Map<String, Object> insertTruckCalculate(@RequestBody(required = false) Map<String, Object> map);
+    //更新汽车衡
+    @PostMapping(value = "api/v1/rms/rmstruckcalculate/updateTruckCalculate")
+    Map<String, Object> updateTruckCalculate(Map<String, Object> map);
+    //根据id查询汽车衡
+    @PostMapping(value = "api/v1/rms/rmstruckcalculate/getTruckCalculateById/{id}")
+
+    Map<String, Object> getTruckCalculateById(@PathVariable("id") BigDecimal id);
+
+
     //根据id删除汽车衡
     @PostMapping(value = "api/v1/rms/rmstruckcalculate/deleteTruckCalculate/{id}")
     Map<String, Object> deleteTruckCalculate(@PathVariable("id") BigDecimal id);
-
+    //模糊查询汽车衡
+    @PostMapping(value = "api/v1/rms/rmstruckcalculate/getTruckCalculateResultList")
+    Map<String, Object> getTruckCalculateResultList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                    @RequestParam Integer pageNum,
+                                                    @RequestParam Integer pageSize,
+                                                    @RequestParam Integer apiId,
+                                                    @RequestParam String con);
+    //原料仓库列表
     @PostMapping(value = "api/v1/rms/rmswarehouse/getWarehouseList")
     Map<String,Object>   getWarehouseList (@RequestBody(required = false) Map<String, Object> mapValue,
                                            @RequestParam("apiId") Integer apiId,
@@ -133,9 +217,101 @@ public interface RmsFeign {
     //删除仓库
     @PostMapping(value = "api/v1/rms/rmswarehouse/deleteWarehouse/{id}")
     Map<String, Object> deleteWarehouse(@PathVariable("id") BigDecimal id);
+    //修改仓库
+    @PostMapping(value="api/v1/rms/rmswarehouse/updateWarehouse")
+    Map<String, Object> updateWarehouse(Map<String, Object> map);
+    //根据id获取原料仓库详细信息
+
+    @PostMapping(value = "api/v1/rms/rmswarehouse/getWarehouseById/{id}")
+    Map<String, Object> getWarehouseById(@PathVariable("id") BigDecimal id);
+
+    //模糊查询原料仓库
+    @PostMapping(value = "api/v1/rms/rmswarehouse/getWarehouseResultList")
+    Map<String, Object> getWarehouseResultList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                               @RequestParam Integer pageNum,
+                                               @RequestParam Integer pageSize,
+                                               @RequestParam Integer apiId,
+                                               @RequestParam String con);
+
+    //获取司机排队信息
+    @PostMapping(value = "api/v1/rms/rmsdrivercapacity/getDriverCapacityList")
+    Map<String, Object> getDriverCapacityList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                              @RequestParam("apiId") Integer apiId,
+                                              @RequestParam("pageNum") Integer pageNum,
+                                              @RequestParam("pageSize") Integer pageSize);
+
+    //新增司机排队信息
+    @PostMapping(value = "api/v1/rms/rmsdrivercapacity/insertDriverCapacity")
+    Map<String, Object> insertDriverCapacity(@RequestBody(required = false) Map<String, Object> map);
+
+    //更新司机排队信息
+    @PostMapping(value = "api/v1/rms/rmsdrivercapacity/updateDriverCapacity")
+    Map<String, Object> updateDriverCapacity(@RequestBody(required = false) Map<String, Object> map);
+
+    //删除司机排队信息
+    @PostMapping(value = "api/v1/rms/rmsdrivercapacity/deleteDriverCapacity/{id}")
+    Map<String, Object> deleteDriverCapacity(@PathVariable("id") BigDecimal id);
+
+    //根据id获取司机排队信息
+    @PostMapping(value = "api/v1/rms/rmsdrivercapacity/getDriverCapacityById/{id}")
+    Map<String, Object> getDriverCapacityById(@PathVariable("id") BigDecimal id);
+
+
+    //获取门岗信息列表
+    @PostMapping(value = "api/v1/rms/rmsgatepost/getGatepostList")
+    Map<String,Object>     getGatepostList(@RequestBody(required = false) Map<String,Object> mapValue,
+                                           @RequestParam("apiId") Integer apiId,
+                                           @RequestParam("pageNum") Integer pageNum,
+                                           @RequestParam("pageSize") Integer pageSize,
+                                           @RequestParam String con);
+    //新增门岗
+    @PostMapping(value = "api/v1/rms/rmsgatepost/insertGatepost")
+    Map<String,Object> insertGatepost(@RequestBody(required = false) Map<String,Object> map);
+    //删除门岗
+    @PostMapping(value = "api/v1/rms/rmsgatepost/deleteGatepost/{id}")
+    Map<String, Object> deleteGatepost(@PathVariable("id") BigDecimal id);
+    //    更新门岗信息
+    @PostMapping(value = "api/v1/rms/rmsgatepost/updateGatepost")
+    Map<String, Object> updateGatepost(@RequestBody(required = false) Map<String, Object> map);
+    //    根据id获取门岗规则信息
+    @PostMapping(value = "api/v1/rms/rmsgatepost/getGatepostById/{id}")
+    Map<String, Object> getGatepostById(@PathVariable("id") BigDecimal id);
+
     //******************************************下拉框*******************************
+    @GetMapping(value = "api/v1/rms/rmscapacity/getCapacityTypeId")
+    Map<String, Object> getCapacityTypeId();
+
+    @GetMapping(value = "api/v1/rms/rmswarehouse/getWarehouseTypeId" )
+    Map<String, Object> getWarehouseTypeId();
+
+    @GetMapping(value= "api/v1/rms/rmswarehouse/getPortId")
+    Map<String, Object> getPortId();
+
+    @GetMapping(value = "api/v1/rms/rmscapacity/getCarrierId")
+    Map<String, Object> getCarrierId();
+
+
+    //******************************************下拉框*******************************
+//    根据id下拉获取运力列表
     @GetMapping(value = "/api/v1/rms/rmscapacity/getCapacityId")
     Map<String, Object> getCapacityId();
+    //    根据id下拉框获取原料类型
+    @GetMapping(value = "api/v1/rms/rmsmaterial/getMaterialTypeId")
+    Map<String, Object> getMaterialTypeId();
+    //    根据id下拉框获取计量类型
+    @GetMapping(value = "api/v1/rms/rmsmaterial/getUnitOfMeasureId")
+    Map<String, Object> getUnitOfMeasureId();
+    //    根据id下拉框获取托运人
+    @GetMapping(value = "api/v1/rms/rmspersonnel/getShipperId")
+    Map<String, Object> getShipperId();
+
+    //获取司机下拉框
+    @GetMapping(value = "api/v1/rms/rmsdrivercapacity/getDriverId")
+    Map<String, Object> getDriverId();
+
+    //    根据id下拉框获取门岗规则
+    @GetMapping(value = "api/v1/rms/rmsgatepost/getShipperId")
+    Map<String, Object> getGatepostRulesId();
 
     /**
      * @author huk
@@ -161,7 +337,8 @@ public interface RmsFeign {
                                         @RequestParam("pageNum") Integer pageNum,
                                         @RequestParam("pageSize")Integer pageSize,
                                         @RequestParam("apiId")Integer apiId,
-                                        @RequestParam("con")String con);
+                                        @RequestParam("con")String con,
+                                       @RequestParam("lineType")Integer lineType);
 
     @ApiOperation(value = "根据主键查询出数据以供修改")
     @PostMapping("/api/v1/rms/rmslines/getLinkToUpdate")

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

@@ -318,8 +318,12 @@ public interface TmsTruckFeign {
     Map<String, Object> addDaZhouToDaGangLoadResult(@RequestBody(required = false)Map<String, Object> map);
 
     @ApiOperation(value="新增钢材到异地库达州站驻港人员确定收货")
-    @PostMapping("/addSteelNzReceiptResult")
+    @PostMapping("api/v1/truckTms/tmstruckreceiptresults/addSteelNzReceiptResult")
     public Map<String, Object> addSteelNzReceiptResult(@RequestBody(required = false) Map<String, Object> map);
+
+
+    @PostMapping("api/v1/truckTms/tmstruckweightresults/updateTruckWeight")
+    public Map<String, Object> updateTruckWeight(@RequestBody List<Map<String, Object>> mapList);
 }
 
 

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

@@ -52,13 +52,29 @@ public interface WMSFeign {
     @RequestMapping(value = "/api/v1/wms/wmspoutboundresults/insertWmspOutBoundResult",method = RequestMethod.POST)
     Map<String,Object> insertWmspOutBoundResult(@RequestBody(required = false) Map<String, Object> mapval);
 
+    /**
+     * 逻辑删除出库单
+     * @param resultId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/wms/wmspoutboundresults/deletewmspOutboundResult")
+    Map<String,Object> deleteWmspOutboundResult(@RequestParam Integer resultId);
+
     /**
      * 新增出库扫描实绩
-     * @param mapval
+     * @param map
+     * @return
+     */
+    @PostMapping(value = "/api/v1/wms/wmspoutboundresults/insertwmspOutboundScanResult")
+    Map<String,Object> insertwmspOutboundScanResult(@RequestBody(required = false) Map<String, Object> map);
+
+    /**
+     * 装卸工PDA前端点击出库
+     * @param resultId
      * @return
      */
-    @PostMapping(value = "/api/v1/wms/wmspoutboundscanresults/insertWmspOutboundScanResult")
-    Map<String,Object> insertWmspOutboundScanResult(@RequestBody(required = false) Map<String, Object> mapval);
+    @PostMapping("/api/v1/wms/wmspoutboundresults/outbountResultToSuccess")
+    Map<String,Object> outbountResultToSuccess(@RequestParam Integer resultId);
 
     /**
      * 更新出库状态
@@ -475,7 +491,7 @@ public interface WMSFeign {
      * @return
      */
     @RequestMapping(value = "/api/v1/wms/inboundResult/insertInboundResult",method = RequestMethod.POST)
-    String insertInboundResult(@RequestBody List<Map<String, Object>> mapList);
+    Map<String,Object> insertInboundResult(@RequestBody List<Map<String, Object>> mapList);
 
     /**
      * 新增退库实绩，返回选择垛位
@@ -541,5 +557,31 @@ public interface WMSFeign {
      */
     @PostMapping(value = "/api/vi/wms/wmsprestackscanresults/selectMaterialSteelIdByReusltId")
     Map<String, Object> selectMaterialSteelIdByReusltId(@RequestBody(required = false) Map<String, Object> map);
+
+    @RequestMapping(value = "/api/v1/wms/inboundResult/selectScanResultByIboundResultId",method = RequestMethod.POST)
+    RESTfulResult selectScanResultByIboundResultId(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                   @RequestParam Integer apiId,
+                                                   @RequestParam Integer pageNum,
+                                                   @RequestParam Integer pageSize);
+
+    @RequestMapping(value = "/api/v1/wms/wmspivboundmakeresult/getIvboundMakeResultList",method = RequestMethod.POST)
+    RESTfulResult getIvboundMakeResultList(@RequestBody(required = false)Map<String, Object> mapValue,
+                                           @RequestParam Integer pageNum,
+                                           @RequestParam Integer pageSize,
+                                           @RequestParam Integer apiId,
+                                           @RequestParam String con);
+
+    @PostMapping(value = "/api/v1/wms/wmspivboundmakeresult/addIvboundMakeResult")
+    Map<String, Object> addIvboundMakeResult(@RequestBody Map<String, Object> mapValue);
+
+    @PostMapping(value = "/api/v1/wms/wmspivboundmakeresult/deleteIvboundMakeResult/{resultId}")
+    Map<String, Object> deleteIvboundMakeResult(@PathVariable("resultId") Integer resultId);
+
+    @PostMapping(value = "/api/v1/wms/wmspivboundmakeresult/selectIvboundMakeResult/{resultId}")
+    List<Map<String, Object>> selectIvboundMakeResult(@PathVariable("resultId") Integer resultId);
+
+    @PostMapping(value = "/api/v1/wms/wmspivboundmakeresult/updateIvboundMakeResult")
+    Map<String, Object> updateIvboundMakeResult(@RequestBody Map<String, Object> mapValue);
+
 }
 

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

@@ -20,7 +20,7 @@ public interface UniversalMapper {
     List<Map<String, Object>> getOOMMes(String orderNumber);
 
     //模糊查询所有物资
-    List<Map<String, Object>> queryMaterialByLike(Map<String, Object> map);
+    List<Map<String, Object>> queryAPOMaterialByLike(Map<String, Object> map);
 
     //模糊查询发货单位
     List<Map<String, Object>> querySupplierByLike(Map<String, Object> map);
@@ -30,4 +30,14 @@ public interface UniversalMapper {
 
     //通过运输订单ID查询物资子表（针对钢材）
     List<Map<String, Object>> getMaterialMesByOrderId(Map<String, Object> map);
+
+    //通过物资ID查询该物资的发货单位信息
+    List<Map<String, Object>> getSupplierMesByMaterialId(Map<String, Object> map);
+
+    //模糊查询所有的卸货点信息
+    List<Map<String, Object>> getUnloadingMesByLike(Map<String, Object> map);
+
+    //模糊查询所有物资
+    List<Map<String, Object>> queryMaterialByLike(Map<String, Object> map);
+
 }

src/main/resources/bootstrap.yml

@@ -49,7 +49,7 @@ openfeign:
   OMSFeign:
     url: ${OMSFEIGN_URL:localhost:8095}
   RmsFeign:
-    url: ${RMSFEIGN_HRL:localhost:8060}
+    url: ${RMSFEIGN_HRL:192.168.1.115:8060}
 
 genxml:
   pth: com/a

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

@@ -57,21 +57,30 @@
     </sql>
 
     <!--  模糊查询所有物资  -->
-    <select id="queryMaterialByLike" parameterType="java.util.Map" resultType="java.util.Map">
+    <select id="queryAPOMaterialByLike" parameterType="java.util.Map" resultType="java.util.Map">
         SELECT *
         FROM (
-        SELECT RM.MATERIAL_ID "materialId",
-        RM.MATERIAL_NAME "materialName",
-        RM.MATERIAL_CODE "materialCode",
-        RM.MATERIAL_SPECIFICATION "materialSpecification",
-        RM.MATERIAL_MODEL "materialModel"
-        FROM RMS_MATERIAL RM
-        WHERE RM.MATERIAL_NAME LIKE #{index}
+                SELECT DISTINCT RM.MATERIAL_ID "materialId",
+                    RM.MATERIAL_NAME "materialName",
+                    RM.MATERIAL_CODE "materialCode",
+                    RM.MATERIAL_SPECIFICATION "materialSpecification",
+                    RM.MATERIAL_MODEL "materialModel"
+                FROM AMS_PURCHASE_ORDER APO
+                    LEFT JOIN DIL_BATCH DB
+                        ON DB.BATCH_ID = APO.BATCH_ID
+                    LEFT JOIN RMS_MATERIAL RM
+                        ON RM.MATERIAL_ID = DB.MATERIAL_ID
+                <where>
+                    <if test="index != null">
+                        RM.MATERIAL_NAME LIKE #{index}
+                    </if>
+                </where>
         )
         <where>
             <if test="materialName != null">
+
                 <foreach collection="materialName" item="item" open="(" separator="or" close=")">
-                    "materialName" like '%${item}%'
+                 "materialName" like '%${item}%'
                 </foreach>
             </if>
             <if test="materialCode != null">
@@ -106,7 +115,11 @@
         RS.SUPPLIER_NAME "supplierName",
         RS.SUPPLIER_ADDRESS "supplierAddress"
         FROM RMS_SUPPLIER RS
-        WHERE RS.SUPPLIER_NAME LIKE #{index}
+        <where>
+            <if test="index != null">
+                RS.SUPPLIER_NAME LIKE #{index}
+            </if>
+        </where>
         )
         <where>
             <if test="supplierName != null">
@@ -129,21 +142,24 @@
 
     <!--  获取所有的运力信息 -->
     <select id="getAllCapacityByCarrierLike" parameterType="java.util.Map" resultType="java.util.LinkedHashMap">
-        SELECT
-            RDC.DRIVER_CAPACITY_ID "driverCapacityId",
-            RDC.CAPACITY_ID "capacityId",
-            RCD.DRIVER_NAME "driverName",
-            RC.CAPACITY_NUMBER "capacityNumber",
-            RCA.CARRIER_NAME "carrierName"
-        FROM RMS_DRIVER_CAPACITY RDC
-        LEFT JOIN RMS_CAR_DRIVER RCD
-            ON RCD.DRIVER_ID = RDC.DRIVER_ID
-        LEFT JOIN RMS_CAPACITY RC
-            ON RC.CAPACITY_ID = RDC.CAPACITY_ID
-        LEFT JOIN RMS_CARRIER RCA
-            ON RCA.CARRIER_ID = RDC.CARRIER_ID
-        WHERE RC.CAPACITY_STATUS = 0
-            and RCA.CARRIER_NAME LIKE #{index}
+
+        SELECT *
+        FROM (
+                 SELECT
+                        RC.CAPACITY_ID        "capacityId",
+                        RC.CAPACITY_NUMBER     "capacityNumber",
+                        RCA.CARRIER_NAME       "carrierName"
+                 FROM RMS_CAPACITY RC
+                          LEFT 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}
+                   </if>
+                   <if test="index == null">
+                       and rownum &lt; 21
+                   </if>
+             )
     </select>
 
 <!--    通过订单ID查询物资子表信息  -->
@@ -186,4 +202,113 @@
         </if>
     </select>
 
+<!--  通过物资ID查询该物资的发货单位信息  -->
+    <select id="getSupplierMesByMaterialId" parameterType="java.util.Map" resultType="java.util.Map">
+        select *
+        from (
+                 select distinct RS.SUPPLIER_ID      "supplierId",
+                                 RS.SUPPLIER_NAME    "supplierName",
+                                 RS.SUPPLIER_ADDRESS "supplierAddress"
+                 from DIL_BATCH DB
+                          left join AMS_PURCHASE_ORDER APO
+                                    on apo.BATCH_ID = DB.BATCH_ID
+                          left join RMS_SUPPLIER RS
+                                    on RS.SUPPLIER_ID = apo.SUPPLIER_UNIT_ID
+                 <where>
+                    <if test="materialId != null">
+                        DB.MATERIAL_ID = #{materialId}
+                    </if>
+                 </where>
+             )
+        <where>
+            <if test="index != null">
+                "supplierName" like #{index}
+            </if>
+        </where>
+    </select>
+
+<!--  模糊查询所有的卸货点信息  -->
+    <select id="getUnloadingMesByLike" parameterType="map" resultType="java.util.Map">
+
+        select *
+        from (
+                 select
+                        RW.WAREHOUSE_ID   "warehouseId",
+                        RW.WAREHOUSE_NAME "warehouseName"
+                 from RMS_WAREHOUSE RW
+                 <where>
+                     <if test="type != null">
+                         RW.WAREHOUSE_TYPE_ID = #{type}
+                     </if>
+                 </where>
+             )
+        <where>
+            <if test="index != null">
+                "warehouseName" like #{index}
+            </if>
+            <if test="warehouseName != null">
+                <foreach collection="warehouseName" item="item" open="(" separator="or" close=")">
+                    "warehouseName" like '%${item}%'
+                </foreach>
+            </if>
+        </where>
+        <include refid="orderBy"></include>
+        <if test="orderField == null  ">
+            order by "warehouseName" desc
+        </if>
+    </select>
+
+    <!--  模糊查询所有物资  -->
+    <select id="queryMaterialByLike" parameterType="java.util.Map" resultType="java.util.Map">
+        SELECT *
+        FROM (
+        SELECT RM.MATERIAL_ID "materialId",
+        RM.MATERIAL_NAME "materialName",
+        RM.MATERIAL_CODE "materialCode",
+        RM.MATERIAL_SPECIFICATION "materialSpecification",
+        RM.MATERIAL_MODEL "materialModel"
+        FROM RMS_MATERIAL RM
+        <where>
+            <if test="startNum != null">
+                RM.MATERIAL_CODE LIKE #{startNum}
+            </if>
+            <if test="startNum == null">
+                RM.MATERIAL_CODE LIKE '010%' OR RM.MATERIAL_CODE LIKE '0801%'
+            </if>
+        </where>
+        )
+        <where>
+            <if test="index != null">
+                "materialName" LIKE #{index}
+            </if>
+            <if test="materialName != null">
+                and
+                <foreach collection="materialName" item="item" open="(" separator="or" close=")">
+                    "materialName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="materialCode != null">
+                and
+                <foreach collection="materialCode" item="item" open="(" separator="or" close=")">
+                    "materialCode" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="materialSpecification != null">
+                and
+                <foreach collection="materialSpecification" item="item" open="(" separator="or" close=")">
+                    "materialSpecification" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="materialModel != null">
+                and
+                <foreach collection="materialModel" item="item" open="(" separator="or" close=")">
+                    "materialModel" like '%${item}%'
+                </foreach>
+            </if>
+        </where>
+        <include refid="orderBy"></include>
+        <if test="orderField == null  ">
+            order by "materialId" desc
+        </if>
+    </select>
 </mapper>