|
|
@@ -8,6 +8,7 @@ import com.steerinfo.framework.controller.RESTfulResult;
|
|
|
import io.swagger.annotations.ApiImplicitParam;
|
|
|
import io.swagger.annotations.ApiImplicitParams;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
+import lombok.extern.java.Log;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
|
@@ -99,7 +100,7 @@ public class RMScontroller extends BaseRESTfulController {
|
|
|
return rmsFeign.LinkInsertSelective(mapValue);
|
|
|
}
|
|
|
|
|
|
- //物资类型
|
|
|
+ //================物资类型
|
|
|
@PostMapping("/getMaterialTypeList")
|
|
|
@ApiOperation(value = "查询物资种类列表")
|
|
|
public Map<String, Object> getMaterialTypeList(@RequestBody(required = false) Map<String, Object> mapValue,
|
|
|
@@ -138,7 +139,7 @@ public class RMScontroller extends BaseRESTfulController {
|
|
|
}
|
|
|
|
|
|
|
|
|
- //物资
|
|
|
+ //====================物资
|
|
|
@ApiOperation(value="获取物资列表")
|
|
|
@ApiImplicitParams({
|
|
|
@ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
|
|
|
@@ -174,7 +175,7 @@ public class RMScontroller extends BaseRESTfulController {
|
|
|
@ApiOperation(value="更新物资", notes="根据rmsMaterial对象创建")
|
|
|
@ApiImplicitParam(name = "rmsMaterial", value = "详细实体rmsMaterial", required = true, dataType = "rmsMaterial")
|
|
|
@PostMapping(value = "/updateMaterial")
|
|
|
- @LogAround(foreignKeys = {"materialId"},foreignKeyTypes = {"物资"},description = "修改物资")
|
|
|
+ @LogAround(foreignKeys = {"operationPointId"},foreignKeyTypes = {"物资"},description = "修改物资")
|
|
|
public Map<String, Object> updateMaterial(@RequestBody(required = false) Map<String, Object> map){
|
|
|
return rmsFeign.updateMaterial(map);
|
|
|
}
|
|
|
@@ -185,6 +186,53 @@ public class RMScontroller extends BaseRESTfulController {
|
|
|
return rmsFeign.getMaterialById(id);
|
|
|
}
|
|
|
|
|
|
+
|
|
|
+ //====================作业点
|
|
|
+ @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("/getOperationPointList")
|
|
|
+ public Map<String, Object> getOperationPointList(@RequestBody(required=false) Map<String,Object> mapValue,
|
|
|
+ Integer apiId,
|
|
|
+ Integer pageNum,
|
|
|
+ Integer pageSize
|
|
|
+ ){
|
|
|
+ return rmsFeign.getOperationPointList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
|
|
|
+ }
|
|
|
+ @ApiOperation(value="新增作业点", notes="根据rmsOperationPoint对象创建")
|
|
|
+ @ApiImplicitParam(name = "rmsOperationPoint", value = "详细实体rmsOperationPoint", required = true, dataType = "rmsOperationPoint")
|
|
|
+ @PostMapping(value = "/insertOperationPoint")
|
|
|
+ @LogAround(foreignKeys = {"operationPointId"},foreignKeyTypes = {"作业点"},description = "新增作业点")
|
|
|
+ public Map<String, Object> insertOperationPoint(@RequestBody(required = false) Map<String, Object> map){
|
|
|
+ return rmsFeign.insertOperationPoint(map);
|
|
|
+ }
|
|
|
+ @ApiOperation(value="删除", notes="根据rmsCarrier对象创建")
|
|
|
+ @ApiImplicitParam(name = "rmsOperationPoint", value = "详细实体rmsOperationPoint", required = true, dataType = "rmsOperationPoint")
|
|
|
+ @PostMapping(value = "/deleteOperationPoint")
|
|
|
+ @LogAround(foreignKeys = {"operationPointId"},foreignKeyTypes = {"作业点"},description = "删除作业点")
|
|
|
+ public Map<String, Object> deleteOperationPoint(@RequestBody(required = false) Map<String, Object> map){
|
|
|
+ return rmsFeign.deleteOperationPoint(map);
|
|
|
+ }
|
|
|
+
|
|
|
+ @ApiOperation(value="更新作业点", notes="根据rmsOperationPoint对象创建")
|
|
|
+ @ApiImplicitParam(name = "rmsOperationPoint", value = "详细实体rmsOperationPoint", required = true, dataType = "rmsOperationPoint")
|
|
|
+ @PostMapping(value = "/updateOperationPoint")
|
|
|
+ @LogAround(foreignKeys = {"operationPointId"},foreignKeyTypes = {"作业点"},description = "修改作业点")
|
|
|
+ public Map<String, Object> updateOperationPoint(@RequestBody(required = false) Map<String, Object> map){
|
|
|
+ return rmsFeign.updateOperationPoint(map);
|
|
|
+ }
|
|
|
+ @ApiOperation(value="根据id查询原料信息", notes="根据rmsCarrier对象创建")
|
|
|
+ @ApiImplicitParam(name = "rmsOperationPoint", value = "详细实体rmsOperationPoint", required = true, dataType = "rmsOperationPoint")
|
|
|
+ @PostMapping(value = "/getOperationPointById/{id}")
|
|
|
+ public Map<String, Object> getOperationPointById(@PathVariable("id") BigDecimal id){
|
|
|
+ return rmsFeign.getOperationPointById(id);
|
|
|
+ }
|
|
|
+
|
|
|
//============人员信息
|
|
|
@ApiOperation(value="获取人员信息列表")
|
|
|
@ApiImplicitParams({
|
|
|
@@ -208,22 +256,26 @@ public class RMScontroller extends BaseRESTfulController {
|
|
|
@ApiOperation(value="新增人员信息", notes="根据rmsMaterial对象创建")
|
|
|
@ApiImplicitParam(name = "rmsPersonnel", value = "详细实体rmsPersonnel", required = true, dataType = "rmsPersonnel")
|
|
|
@PostMapping(value = "/insertPersonnel")
|
|
|
+ @LogAround(foreignKeys = {"personnelId"},foreignKeyTypes = {"人员"})
|
|
|
public Map<String, Object> insertPersonnel(@RequestBody(required = false) Map<String, Object> map){
|
|
|
return rmsFeign.insertPersonnel(map);
|
|
|
}
|
|
|
@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);
|
|
|
+ @PostMapping(value = "/deletePersonnel")
|
|
|
+ @LogAround(foreignKeys = {"personnelId"},foreignKeyTypes = {"人员"})
|
|
|
+ public Map<String, Object> deletePersonnel(@RequestBody(required = false) Map<String, Object> map){
|
|
|
+ return rmsFeign.deletePersonnel(map);
|
|
|
}
|
|
|
|
|
|
@ApiOperation(value="更新人员信息", notes="根据rmsMaterial对象创建")
|
|
|
@ApiImplicitParam(name = "rmsPersonnel", value = "详细实体rmsPersonnel", required = true, dataType = "rmsPersonnel")
|
|
|
@PostMapping(value = "/updatePersonnel")
|
|
|
+ @LogAround(foreignKeys = {"personnelId"},foreignKeyTypes = {"人员"})
|
|
|
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}")
|
|
|
@@ -233,7 +285,6 @@ public class RMScontroller extends BaseRESTfulController {
|
|
|
|
|
|
|
|
|
|
|
|
-
|
|
|
//================公司
|
|
|
@ApiOperation(value="展示公司信息")
|
|
|
@ApiImplicitParams({
|
|
|
@@ -637,24 +688,6 @@ public class RMScontroller extends BaseRESTfulController {
|
|
|
return rmsFeign.getOilPriceById(id);
|
|
|
}
|
|
|
|
|
|
-
|
|
|
- /**
|
|
|
- * 新增人员权限
|
|
|
- * @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){
|
|
|
@@ -667,44 +700,6 @@ public class RMScontroller extends BaseRESTfulController {
|
|
|
}
|
|
|
|
|
|
|
|
|
-
|
|
|
- /*
|
|
|
- txf
|
|
|
- */
|
|
|
- @ApiOperation(value="新增组织结构实绩")
|
|
|
- @PostMapping(value = "/addShipperResult")
|
|
|
- public Map<String,Object> addShipperResult(@RequestBody(required = false) Map<String, Object> map){
|
|
|
- return rmsFeign.addShipperResult(map);
|
|
|
- }
|
|
|
-
|
|
|
- @ApiOperation(value="修改组织结构实绩")
|
|
|
- @PostMapping(value = "/updateShipperResult")
|
|
|
- public Map<String,Object> updateShipperResult(@RequestBody(required = false) Map<String, Object> map){
|
|
|
- return rmsFeign.updateShipperResult(map);
|
|
|
- }
|
|
|
-
|
|
|
- @ApiOperation(value="修改组织结构实绩")
|
|
|
- @PostMapping(value = "/deleteShipperResult")
|
|
|
- public Map<String,Object> deleteShipperResult(@RequestBody(required = false) Map<String, Object> map){
|
|
|
- return rmsFeign.deleteShipperResult(map);
|
|
|
- }
|
|
|
-
|
|
|
- @PostMapping(value = "/getCarrierNameBySSOId")
|
|
|
- public Map<String,Object> getCarrierNameBySSOId(@RequestParam("carrierSSOId") String carrierSSOId){
|
|
|
- return rmsFeign.getCarrierNameBySSOId(carrierSSOId);
|
|
|
- }
|
|
|
- //边输边查收货客户父节点
|
|
|
- @PostMapping(value = "getConsigneeFarId")
|
|
|
- public Map<String,Object> getConsigneeFarId(@RequestParam(value ="state") String state){
|
|
|
- return rmsFeign.getConsigneeFarId(state);
|
|
|
- }
|
|
|
-
|
|
|
- @PostMapping("/isInHere")
|
|
|
- public Integer isInHere(@RequestParam String personnelJobNumber) {
|
|
|
- return rmsFeign.isInHere(personnelJobNumber);
|
|
|
- }
|
|
|
-
|
|
|
-
|
|
|
@ApiOperation(value="创建", notes="添加油品名称")
|
|
|
@ApiImplicitParam(name = "oilTypeName", value = "油品名称", required = true, dataType = "String")
|
|
|
@PostMapping(value = "/addOilType")
|
|
|
@@ -724,15 +719,6 @@ public class RMScontroller extends BaseRESTfulController {
|
|
|
return rmsFeign.deleteCapacityCarrier(map!=null?map:new HashMap<>());
|
|
|
}
|
|
|
|
|
|
- @ApiOperation("罗棒的")
|
|
|
- @PostMapping("/getInwardContractMaterial")
|
|
|
- public RESTfulResult getInwardContractMaterial(@RequestBody(required = false) Map<String,Object> map,
|
|
|
- Integer apiId,
|
|
|
- Integer pageNum,
|
|
|
- Integer pageSize,
|
|
|
- String con){
|
|
|
- return rmsFeign.getInwardContractMaterial(map!=null?map:new HashMap<>(),apiId,pageNum,pageSize,con);
|
|
|
- }
|
|
|
|
|
|
@ApiOperation("渲染运力修改数据")
|
|
|
@PostMapping("/getCapacityInfoById/{id}")
|
|
|
@@ -740,50 +726,6 @@ public class RMScontroller extends BaseRESTfulController {
|
|
|
return rmsFeign.getCapacityInfoById(id);
|
|
|
}
|
|
|
|
|
|
- //获取货权转移送达单位列表
|
|
|
- @PostMapping(value = "/getCargoDep")
|
|
|
- public Map<String,Object> getCargoDep(@RequestBody(required = false) Map<String, Object> mapValue,
|
|
|
- Integer apiId,
|
|
|
- Integer pageNum,
|
|
|
- Integer pageSize,
|
|
|
- String con){
|
|
|
- if (mapValue==null){
|
|
|
- mapValue=new HashMap<>();
|
|
|
- }
|
|
|
- return rmsFeign.getCargoDep(mapValue,apiId,pageNum,pageSize,con);
|
|
|
- }
|
|
|
- //删除货权转移送达单位
|
|
|
- @PostMapping(value = "/deleteCargoDep")
|
|
|
- public Map<String, Object> deleteCargoDep(@RequestBody(required = false) Map<String,Object> map){
|
|
|
- return rmsFeign.deleteCargoDep(map);
|
|
|
- }
|
|
|
- @PostMapping(value = "/getCargoDepById/{id}")
|
|
|
- public Map<String,Object> getCargoDepById(@PathVariable("id") BigDecimal id){
|
|
|
- return rmsFeign.getCargoDepById(id);
|
|
|
- }
|
|
|
-
|
|
|
- //更新货权转移送达单位
|
|
|
- @PostMapping(value = "/updateCargoDep")
|
|
|
- public Map<String, Object> updateCargoDep(@RequestBody(required = false) Map<String,Object> map){
|
|
|
- return rmsFeign.updateCargoDep(map);
|
|
|
- }
|
|
|
-
|
|
|
- //新增货权转移送达单位
|
|
|
- @PostMapping(value = "/insertCargoDep")
|
|
|
- public Map<String, Object> insertCargoDep(@RequestBody(required = false) Map<String,Object> map){
|
|
|
- return rmsFeign.insertCargoDep(map);
|
|
|
- }
|
|
|
-
|
|
|
-
|
|
|
- //收货客户注册
|
|
|
- @PostMapping(value = "/signConsignee")
|
|
|
- public Map<String, Object> signConsignee(@RequestBody Map<String,Object> mapVal){
|
|
|
- return rmsFeign.signConsignee(mapVal);
|
|
|
- }
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
@ApiOperation(value = "查询运力类型")
|
|
|
@PostMapping("/getCapacityType")
|
|
|
public Map<String, Object> getCapacityType(@RequestBody(required = false) Map<String,Object> map,
|