Merge branch 'master' of https://gitee.com/antai-wuliu/ANTAI-API

src/main/java/com/steerinfo/dil/config/RequestFilter.java

@@ -29,8 +29,8 @@ public class RequestFilter implements Filter {
            Cookie[] cookies = httpRequest.getCookies();
            String userId = httpRequest.getHeader("userid");
            String userName = httpRequest.getHeader("username");
-           String orgCode = httpRequest.getHeader("orgCode");
-           String roleCodes = httpRequest.getHeader("roleCodes");
+           String orgCode = httpRequest.getHeader("orgcode");
+           String roleCodes = httpRequest.getHeader("rolecodes");
            //获取cookie用户数据
            if (cookies != null && cookies.length > 0) {
                for (Cookie cookie : cookies) {
@@ -48,9 +48,11 @@ public class RequestFilter implements Filter {
                    }
                }
            }
-           userName = URLDecoder.decode(userName, "utf-8");
-           orgCode = URLDecoder.decode(orgCode, "utf-8");
-           roleCodes = URLDecoder.decode(roleCodes, "utf-8");
+           try {
+               userName = URLDecoder.decode(userName, "utf-8");
+               orgCode = URLDecoder.decode(orgCode, "utf-8");
+               roleCodes = URLDecoder.decode(roleCodes, "utf-8");
+           }catch (Exception e){}
            httpRequest.setAttribute("userId", userId);
            httpRequest.setAttribute("userName", userName);
            httpRequest.setAttribute("orgCode", orgCode);
@@ -76,6 +78,7 @@ public class RequestFilter implements Filter {
                chain.doFilter(request, response);
            }
        } catch (Exception e) {
+           e.printStackTrace();
            chain.doFilter(request, response);
        }
     }

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

@@ -101,18 +101,18 @@ public class AMScontroller {
     public Map<String, Object> productionRequirementAdd(@RequestBody(required = false) Map<String, Object> map) throws ParseException {
         map.put("insertUsername", map.get("userName").toString());
         if (map.containsKey("requirementStartTime")){
-            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH24:mi:ss");
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             Date requirementStartTime = simpleDateFormat.parse(map.get("requirementStartTime").toString());
             map.put("requirementStartTime", requirementStartTime);
         }
 
         if (map.containsKey("requirementEndTime")){
-            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH24:mi:ss");
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             Date requirementEndTime = simpleDateFormat.parse(map.get("requirementEndTime").toString());
             map.put("requirementEndTime", requirementEndTime);
         }
         if (map.containsKey("dueTime")){
-            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH24:mi:ss");
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             Date dueTime = simpleDateFormat.parse(map.get("dueTime").toString());
             map.put("dueTime", dueTime);
         }
@@ -357,6 +357,65 @@ public class AMScontroller {
         return amsFeign.logicdeleteAmsSaalryContrac(map);
     }
 
+    @ApiOperation(value = "销售需求新增接口", notes = "销售需求新增接口")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "json格式具体参数", required = true, dataType = "Map<String,Object>")
+    })
+    @PostMapping(value = "/saleAdd")
+    @LogAround(foreignKeys = {"transPlanId"}, foreignKeyTypes = {"采购计划"})
+    public Map<String, Object> saleAdd(@RequestBody(required = false) Map<String, Object> map) {
+        return amsFeign.saleAdd(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"),
+    })
+    @PostMapping(value = "/selectDlivDirNo")
+    Map<String, Object> selectDlivDirNo(@RequestBody(required=false) HashMap<String,Object> mapValue,
+                                        Integer apiId,
+                                        Integer pageNum,
+                                        Integer pageSize){
+        return amsFeign.selectDlivDirNo(mapValue == null ? new HashMap<>() : mapValue,apiId,pageNum,pageSize);
+    }
+
+    @ApiOperation(value = "修改发货单状态", notes = "修改发货单状态")
+    @ApiImplicitParam(name = "params", value = "修改内容", required = false, dataType = "ArrayList<HashMap<String, Object>>")
+    @PostMapping(value = "/updateOrder")
+    public RESTfulResult udpateOrder(@RequestBody(required = false) HashMap<String, Object> parmas) {
+        return amsFeign.udpateOrder(parmas);
+    }
+
+    @ApiOperation(value = "退货", notes = "根据填写的数据将发货单进行退货")
+    @ApiImplicitParam(name = "params", value = "查询内容", required = false, dataType = "HashMap<String, Object>")
+    @PostMapping(value = "/returnGoods")
+    public RESTfulResult returnGoods(@RequestBody(required = false) HashMap<String, Object> params) {
+        return amsFeign.returnGoods(params);
+    }
+
+    @ApiOperation(value = "撤销退货", notes = "根据发货单号将发货单的退货记录清除")
+    @ApiImplicitParam(name = "id", value = "查询内容", required = false, dataType = "String")
+    @PostMapping(value = "revokeReturnGoods/{id}")
+    public RESTfulResult revokeReturnGoods(@PathVariable("id") String id) {
+        return amsFeign.revokeReturnGoods(id);
+    }
+
+    @ApiOperation(value = "查询发货单第几次退库", notes = "查询发货单第几次退库")
+    @ApiImplicitParam(name = "dlivDirno", value = "查询内容", required = false, dataType = "String")
+    @GetMapping(value = "/getcut/{dlivDirno}")
+    public RESTfulResult getcut(@PathVariable String dlivDirno) {
+        return amsFeign.getcut(dlivDirno);
+    }
+
+    @ApiOperation(value = "修改发货单信息", notes = "根据填写的数据将发货单进行修改")
+    @ApiImplicitParam(name = "params", value = "查询内容", required = false, dataType = "HashMap<String, Object>")
+    @PostMapping(value = "/editButton")
+    public RESTfulResult editButton(@RequestBody(required = false) HashMap<String, Object> params) {
+        return amsFeign.editButton(params);
+    }
 
     @ApiOperation(value="展示销售合同")
     @ApiImplicitParams({
@@ -372,4 +431,103 @@ public class AMScontroller {
                                                    Integer pageSize){
         return amsFeign.selectSaleContractPage(mapValue == null ? new HashMap<>() : mapValue,apiId,pageNum,pageSize);
     }
+
+    @ApiOperation(value = "生产计划新增接口", notes = "生产计划新增接口")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "json格式具体参数", required = true, dataType = "Map<String,Object>")
+    })
+    @PostMapping(value = "/productionPlanAdd")
+    @LogAround(foreignKeys = {"transPlanId"}, foreignKeyTypes = {"生产计划"})
+    public Map<String, Object> productionPlanAdd(@RequestBody(required = false) Map<String, Object> map) {
+        return amsFeign.productionPlanAdd(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"),
+    })
+    @PostMapping(value = "/getproductionPlanList")
+    Map<String, Object> getproductionPlanList(@RequestBody(required = false) Map<String, Object> map,
+                                             Integer apiId,
+                                             Integer pageNum,
+                                             Integer pageSize
+    ) {
+        return amsFeign.getproductionPlanList(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
+    }
+    @ApiOperation(value = "生产计划新增接口", notes = "生产计划新增接口")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "json格式具体参数", required = true, dataType = "Map<String,Object>")
+    })
+    @PostMapping(value = "/productionPlanChange")
+    @LogAround(foreignKeys = {"transPlanId"}, foreignKeyTypes = {"生产计划"})
+    public Map<String, Object> productionPlanChange(@RequestBody(required = false) Map<String, Object> map) {
+        return amsFeign.productionPlanChange(map);
+    }
+    @ApiOperation(value = "生产计划新增接口", notes = "生产计划新增接口")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "json格式具体参数", required = true, dataType = "Map<String,Object>")
+    })
+    @PutMapping(value = "/productionPlanlogicdelete")
+    @LogAround(foreignKeys = {"transPlanId"}, foreignKeyTypes = {"生产计划"})
+    public Map<String, Object> productionPlanlogicdelete(@RequestBody(required = false) Map<String, Object> map) {
+        return amsFeign.productionPlanlogicdelete(map);
+    }
+    @ApiOperation(value = "生产需求逻辑删除", notes = "生产需求逻辑删除")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "json格式具体参数", required = true, dataType = "Map<String,Object>")
+    })
+    @PostMapping(value = "/getProductiveRequirementDelete")
+    @LogAround(foreignKeys = {"transRequirementId"}, foreignKeyTypes = {"生产需求"})
+    public Map<String, Object> getProductiveRequirementDelete(@RequestBody(required = false) Map<String, Object> map) {
+        return amsFeign.getProductiveRequirementDelete(map);
+    }
+
+    @ApiOperation(value = "需求计划新增接口", notes = "需求计划新增接口")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "json格式具体参数", required = true, dataType = "Map<String,Object>")
+    })
+    @PostMapping(value = "/salePlanAdd")
+    @LogAround(foreignKeys = {"transPlanId"}, foreignKeyTypes = {"需求计划"})
+    public Map<String, Object> salePlanAdd(@RequestBody(required = false) Map<String, Object> map) {
+        return amsFeign.salePlanAdd(map);
+    }
+
+    @ApiOperation(value = "需求计划修改接口", notes = "需求计划修改接口")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "json格式具体参数", required = true, dataType = "Map<String,Object>")
+    })
+    @PostMapping(value = "/salePlanUpdate")
+    @LogAround(foreignKeys = {"transPlanId"}, foreignKeyTypes = {"需求计划"})
+    public Map<String, Object> salePlanUpdate(@RequestBody(required = false) Map<String, Object> map) {
+        return amsFeign.salePlanUpdate(map);
+    }
+
+    @ApiOperation(value = "需求计划新增接口", notes = "需求计划新增接口")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "json格式具体参数", required = true, dataType = "Map<String,Object>")
+    })
+    @PostMapping(value = "/salePlanDelete")
+    @LogAround(foreignKeys = {"transPlanId"}, foreignKeyTypes = {"需求计划"})
+    public Map<String, Object> salePlanDelete(@RequestBody(required = false) Map<String, Object> map) {
+        return amsFeign.salePlanDelete(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"),
+    })
+    @PostMapping(value = "/getSalePlanList")
+    Map<String, Object> getSalePlanList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                            Integer apiId,
+                                            Integer pageNum,
+                                            Integer pageSize
+    ) {
+        return amsFeign.getSalePlanList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
+    }
 }

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

@@ -455,7 +455,7 @@ public class RMScontroller extends BaseRESTfulController {
 
     @ApiOperation(value = "创建", notes = "根据RmsDriverCapacity对象创建")
     @ApiImplicitParam(name = "rmsCapacityDriver", value = "详细实体rmsDriverCapacity", required = true, dataType = "RmsDriverCapacity")
-    @PostMapping(value = "/insertDriverCapacity")
+    @PostMapping(value = "/insertCapacityDriver")
     @LogAround(foreignKeys = {"capacityDriverId"},foreignKeyTypes = {"司机排班"})
     public Map<String, Object> insertCapacityDriver(@RequestBody(required = false) Map<String, Object> map) {
         return rmsFeign.insertCapacityDriver(map);

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

@@ -59,7 +59,6 @@ public class SystemFileController extends BaseRESTfulController {
         if (file != null) {
             for (int i = 0; i < file.length; i++) {
                 try {
-
                     //获取系统时间
                     SimpleDateFormat simpleDateFormat = new SimpleDateFormat("/yyyy/MM/dd");
                     //获取文件名
@@ -97,6 +96,56 @@ public class SystemFileController extends BaseRESTfulController {
 
     }
 
+    @PostMapping("/insertFiles")
+    public RESTfulResult insertFiles(String[] fileUuids,String[] fileNames,String[]fileTypes, Map<Object,MultipartFile>FileList, MultipartRequest request) throws Exception {
+
+        List<MultipartFile> files  = new ArrayList<>();
+        int index=-1;
+        for(int i=0;i<21;i++) {
+            MultipartFile file = request.getFile("file" + i);
+            if (file != null) {
+                files.add(file);
+                if (index < 0) {
+                    index = i;
+                }
+            }
+        }
+
+        for (int i = 0; i < fileUuids.length; i++) {
+            //获取系统时间
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("/yyyy/MM/dd");
+            //获取文件名
+            String oldName = fileNames[i].toString();
+            //取当前时间的长整形值包含毫秒
+            String newName = IDutils.getImageName();
+            //重新命名文件
+
+            String filePath = simpleDateFormat.format(new Date())+"/"+fileTypes[i].toString();
+            //获取输入流
+            String fileTypeName = files.get(i).getOriginalFilename();
+            fileTypeName=fileTypeName.substring(fileTypeName.lastIndexOf(".")) ;
+            newName = oldName+"("+newName+")" +fileTypeName;
+            InputStream inputStream = files.get(i).getInputStream();
+            boolean result = ftpFileUtil.uploadToFtp(inputStream, filePath, newName, false);
+            inputStream.close();
+            if (result) {
+                SystemFile uploadFile = new SystemFile();
+                uploadFile.setFilename(oldName);
+                uploadFile.setFilepath(filePath + "/" + newName);
+                uploadFile.setId(fileUuids[i]);
+                SystemFile modela = systemFileService.add(uploadFile);
+                if (modela != null) {
+                    fileUuids[i] += "," + modela.getId();
+                }
+            } else {
+                return failed(null, "上传文件失败");
+            }
+        }
+
+       return success();
+
+    }
+
     @PostMapping("/previewfile")
     public RESTfulResult previewfile(@RequestBody HashMap parmas) {
         String filename = parmas.get("filename").toString();

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

@@ -102,4 +102,223 @@ public class TMSController extends BaseRESTfulController {
                                                  Integer pageSize) {
         return tmsFeign.getTransOrderList(map ==null ? new HashMap<>() : map, apiId, pageNum, pageSize);
     }
+
+    @ApiOperation(value="查询运输订单所有运输实绩")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @PostMapping(value = "/getTransResult")
+    public Map<String, Object> getTransResult(@RequestBody(required = false) Map<String, Object> map){
+        return tmsFeign.getTransResult(map);
+    }
+
+    @ApiOperation(value="同步进厂")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @PostMapping(value = "/syncEnfactoryResult")
+    @LogAround(foreignKeys = {"resultId"},foreignKeyTypes = {"进厂实绩"})
+    public Map<String, Object> syncEnfactoryResult(@RequestBody(required = false) Map<String, Object> map){
+        return tmsFeign.syncEnfactoryResult(map);
+    }
+
+    @ApiOperation(value="同步出厂")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @PostMapping(value = "/syncOutfactoryResult")
+    @LogAround(foreignKeys = {"resultId"},foreignKeyTypes = {"出厂实绩"})
+    public Map<String, Object> syncOutfactoryResult(@RequestBody(required = false) Map<String, Object> map){
+        return tmsFeign.syncOutfactoryResult(map);
+    }
+
+    @ApiOperation(value="同步计量")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @PostMapping(value = "/syncWeightResult")
+    @LogAround(foreignKeys = {"resultId"},foreignKeyTypes = {"计量实绩"})
+    public Map<String, Object> syncWeightResult(@RequestBody(required = false) Map<String, Object> map){
+        return tmsFeign.syncWeightResult(map);
+    }
+
+
+    @ApiOperation(value="销售派发运输订单")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @PostMapping(value = "/saleDispatchOrder")
+    @LogAround(foreignKeys = {"transOrderId"},foreignKeyTypes = {"运输订单"})
+    public Map<String, Object> saleDispatchOrder(@RequestBody(required = false) Map<String, Object> map){
+        return tmsFeign.saleDispatchOrder(map);
+    }
+
+    @ApiOperation(value = "查询销售运输订单")
+    @PostMapping("/getSaleTransOrderList")
+    public Map<String, Object> getSaleTransOrderList(@RequestBody(required = false) Map<String, Object> map,
+                                                 Integer apiId,
+                                                 Integer pageNum,
+                                                 Integer pageSize) {
+        return tmsFeign.getSaleTransOrderList(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
+    }
+    @ApiOperation(value="同步质检")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @PostMapping(value = "/syncQualityResult")
+    @LogAround(foreignKeys = {"resultId"},foreignKeyTypes = {"质检实绩"})
+    public Map<String, Object> syncQualityResult(@RequestBody(required = false) Map<String, Object> map){
+        return tmsFeign.syncQualityResult(map);
+    }
+    @ApiOperation(value="签到")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @PostMapping(value = "/signIn")
+    @LogAround(foreignKeys = {"resultId"},foreignKeyTypes = {"签到实绩"})
+    public Map<String, Object> signIn(@RequestBody(required = false) Map<String, Object> map){
+        return tmsFeign.signIn(map);
+    }
+
+    @ApiOperation(value="换车头")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @PostMapping(value = "/replaceFront")
+    @LogAround(foreignKeys = {"resultId"},foreignKeyTypes = {"换车头实绩"})
+    public Map<String, Object> replaceFront(@RequestBody(required = false) Map<String, Object> map){
+        return tmsFeign.replaceFront(map);
+    }
+
+    @ApiOperation(value="装货")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @PostMapping(value = "/load")
+    @LogAround(foreignKeys = {"resultId"},foreignKeyTypes = {"装货实绩"})
+    public Map<String, Object> load(@RequestBody(required = false) Map<String, Object> map){
+        return tmsFeign.load(map);
+    }
+
+    @ApiOperation(value="装货修改")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @PostMapping(value = "/loadUpd")
+    @LogAround(foreignKeys = {"resultId"},foreignKeyTypes = {"装货实绩"})
+    public Map<String, Object> loadUpd(@RequestBody(required = false) Map<String, Object> map){
+        return tmsFeign.loadUpd(map);
+    }
+
+    @ApiOperation(value="卸货")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @PostMapping(value = "/unload")
+    @LogAround(foreignKeys = {"resultId"},foreignKeyTypes = {"卸货实绩"})
+    public Map<String, Object> unload(@RequestBody(required = false) Map<String, Object> map){
+        return tmsFeign.unload(map);
+    }
+
+    @ApiOperation(value="卸货修改")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @PostMapping(value = "/unloadUpd")
+    @LogAround(foreignKeys = {"resultId"},foreignKeyTypes = {"卸货实绩"})
+    public Map<String, Object> unloadUpd(@RequestBody(required = false) Map<String, Object> map){
+        return tmsFeign.unloadUpd(map);
+    }
+
+    @ApiOperation(value="抵达")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @PostMapping(value = "/arrival")
+    @LogAround(foreignKeys = {"resultId"},foreignKeyTypes = {"抵达实绩"})
+    public Map<String, Object> arrival(@RequestBody(required = false) Map<String, Object> map){
+        return tmsFeign.arrival(map);
+    }
+
+    @ApiOperation(value="签收")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @PostMapping(value = "/receipt")
+    @LogAround(foreignKeys = {"resultId"},foreignKeyTypes = {"签收实绩"})
+    public Map<String, Object> receipt(@RequestBody(required = false) Map<String, Object> map){
+        return tmsFeign.receipt(map);
+    }
+
+
+    @ApiOperation(value="查询厂内车辆数")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @PostMapping(value = "/getCountEnfactory")
+    public Map<String, Object> getCountEnfactory(@RequestBody(required = false) Map<String, Object> map){
+        return tmsFeign.getCountEnfactory(map == null ? new HashMap<>():map);
+    }
+
+    @ApiOperation(value = "查询签到")
+    @PostMapping("/getSignInResultList")
+    public Map<String, Object> getSignInResultList(@RequestBody(required = false) Map<String, Object> map,
+                                                   Integer apiId,
+                                                   Integer pageNum,
+                                                   Integer pageSize) {
+        return tmsFeign.getSignInResultList(map ==null ? new HashMap<>() : map, apiId, pageNum, pageSize);
+    }
+
+    @ApiOperation(value = "查询换车头")
+    @PostMapping("/getReplaceFrontResultList")
+    public Map<String, Object> getReplaceFrontResultList(@RequestBody(required = false) Map<String, Object> map,
+                                                         Integer apiId,
+                                                         Integer pageNum,
+                                                         Integer pageSize) {
+        return tmsFeign.getReplaceFrontResultList(map ==null ? new HashMap<>() : map, apiId, pageNum, pageSize);
+    }
+
+    @ApiOperation(value = "查询进厂")
+    @PostMapping("/getEnfactoryResultList")
+    public Map<String, Object> getEnfactoryResultList(@RequestBody(required = false) Map<String, Object> map,
+                                                 Integer apiId,
+                                                 Integer pageNum,
+                                                 Integer pageSize) {
+        return tmsFeign.getEnfactoryResultList(map ==null ? new HashMap<>() : map, apiId, pageNum, pageSize);
+    }
+
+    @ApiOperation(value = "查询出厂")
+    @PostMapping("/getOutfactoryResultList")
+    public Map<String, Object> getTmsOutfactoryResultList(@RequestBody(required = false) Map<String, Object> map,
+                                                 Integer apiId,
+                                                 Integer pageNum,
+                                                 Integer pageSize) {
+        return tmsFeign.getOutfactoryResultList(map ==null ? new HashMap<>() : map, apiId, pageNum, pageSize);
+    }
+
+    @ApiOperation(value = "查询装货")
+    @PostMapping("/getLoadResultList")
+    public Map<String, Object> getLoadResultList(@RequestBody(required = false) Map<String, Object> map,
+                                                 Integer apiId,
+                                                 Integer pageNum,
+                                                 Integer pageSize) {
+        return tmsFeign.getLoadResultList(map ==null ? new HashMap<>() : map, apiId, pageNum, pageSize);
+    }
+
+
+    @ApiOperation(value = "查询卸货")
+    @PostMapping("/getUnloadResultList")
+    public Map<String, Object> getUnloadResultList(@RequestBody(required = false) Map<String, Object> map,
+                                                 Integer apiId,
+                                                 Integer pageNum,
+                                                 Integer pageSize) {
+        return tmsFeign.getUnloadResultList(map ==null ? new HashMap<>() : map, apiId, pageNum, pageSize);
+    }
+
+    @ApiOperation(value = "查询计量")
+    @PostMapping("/getWeightResultList")
+    public Map<String, Object> getWeightResultList(@RequestBody(required = false) Map<String, Object> map,
+                                                 Integer apiId,
+                                                 Integer pageNum,
+                                                 Integer pageSize) {
+        return tmsFeign.getWeightResultList(map ==null ? new HashMap<>() : map, apiId, pageNum, pageSize);
+    }
+
+    @ApiOperation(value = "查询质检")
+    @PostMapping("/getQualityResultList")
+    public Map<String, Object> getQualityResult(@RequestBody(required = false) Map<String, Object> map,
+                                                 Integer apiId,
+                                                 Integer pageNum,
+                                                 Integer pageSize) {
+        return tmsFeign.getQualityResultList(map ==null ? new HashMap<>() : map, apiId, pageNum, pageSize);
+    }
+
+    @ApiOperation(value = "查询抵达")
+    @PostMapping("/getArrivalResultList")
+    public Map<String, Object> getArrivalResultList(@RequestBody(required = false) Map<String, Object> map,
+                                                 Integer apiId,
+                                                 Integer pageNum,
+                                                 Integer pageSize) {
+        return tmsFeign.getArrivalResultList(map ==null ? new HashMap<>() : map, apiId, pageNum, pageSize);
+    }
+
+    @ApiOperation(value = "查询签收")
+    @PostMapping("/getReceiptResultList")
+    public Map<String, Object> getReceiptResultList(@RequestBody(required = false) Map<String, Object> map,
+                                                 Integer apiId,
+                                                 Integer pageNum,
+                                                 Integer pageSize){
+            return tmsFeign.getReceiptResultList(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
+
+        }
 }

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

@@ -125,5 +125,60 @@ public interface AmsFeign {
 
     @PutMapping("api/v1/ams/amssalarycontracts/logicdelete")
     Map<String, Object> logicdeleteAmsSaalryContrac(@RequestBody(required = false) Map<String, Object> map);
+	
+	@PostMapping(value = "api/v1/ams/amstransrequirements/saleAdd")
+    Map<String, Object> saleAdd(@RequestBody(required = false) Map<String, Object> map);
+
+
+    @PostMapping(value = "api/v1/ams/amstransrequirements/selectDlivDirNo")
+    Map<String, Object> selectDlivDirNo(@RequestBody(required = false) HashMap<String, Object> map,
+                                        @RequestParam  Integer apiId,
+                                        @RequestParam  Integer pageNum,
+                                        @RequestParam  Integer pageSize);
+
+    @PostMapping(value = "api/v1/ams/amsrequirementchilds/udpateOrder")
+    RESTfulResult udpateOrder(@RequestBody(required = false) HashMap<String, Object> params);
+
+    @PostMapping(value = "api/v1/ams/amsrequirementchilds/returnGoods")
+    RESTfulResult returnGoods(@RequestBody(required = false) HashMap<String, Object> params);
+
+    @PostMapping(value = "api/v1/ams/amsrequirementchilds/revokeReturnGoods/{id}")
+    RESTfulResult revokeReturnGoods(@PathVariable("id") String id);
+
+    @GetMapping(value = "api/v1/ams/amsrequirementchilds/getcut/{dlivDirno}")
+    RESTfulResult getcut(@PathVariable String dlivDirno);
+
+    @PostMapping(value = "api/v1/ams/amsrequirementchilds/editButton")
+    RESTfulResult editButton(@RequestBody(required = false) HashMap<String, Object> params);
+
+    @PostMapping(value = "api/v1/ams/amstransplans/productionPlanAdd")
+    Map<String, Object> productionPlanAdd(@RequestBody(required = false)Map<String, Object> map);
+    @PostMapping("api/v1/ams/amstransplans/getproductionPlanList")
+    Map<String, Object> getproductionPlanList(@RequestBody(required = false) Map<String, Object> map,
+                                             @RequestParam Integer apiId,
+                                             @RequestParam Integer pageNum,
+                                             @RequestParam Integer pageSize
+    );
+    @PostMapping(value = "api/v1/ams/amstransplans/productionPlanChange")
+    Map<String, Object> productionPlanChange(@RequestBody(required = false)Map<String, Object> map);
+    @PutMapping(value = "api/v1/ams/amstransplans/logicdelete")
+    Map<String, Object> productionPlanlogicdelete(@RequestBody(required = false)Map<String, Object> map);
+    @PostMapping(value = "api/v1/ams/amstransrequirements/getProductiveRequirementDelete")
+    Map<String, Object> getProductiveRequirementDelete(@RequestBody(required = false)Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/ams/amstransplans/salePlanAdd")
+    Map<String, Object> salePlanAdd(@RequestBody(required = false)Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/ams/amstransplans/salePlanUpdate")
+    Map<String, Object> salePlanUpdate(@RequestBody(required = false)Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/ams/amstransplans/salePlanDelete")
+    Map<String, Object> salePlanDelete(@RequestBody(required = false)Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/ams/amstransplans/getSalePlanList")
+    Map<String, Object> getSalePlanList(@RequestBody(required = false) Map<String, Object> map,
+                                        @RequestParam Integer apiId,
+                                        @RequestParam Integer pageNum,
+                                        @RequestParam Integer pageSize);
 
 }

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

@@ -46,17 +46,122 @@ public interface TmsFeign {
                                                 @RequestParam  Integer pageNum,
                                                 @RequestParam  Integer pageSize);
 
-    @PostMapping("api/v1/tms/omstransorders/deleteTransOrder")
-    Map<String, Object> deleteTransOrder(@RequestBody(required = false) Map<String, Object> map);
-
-    @PostMapping("api/v1/tms/omstransorders/closeTransOrder")
-    Map<String, Object> closeTransOrder(@RequestBody(required = false) Map<String, Object> map);
 
     @PostMapping("api/v1/tms/omstransorders/changeTransOrder")
     Map<String, Object> changeTransOrder(Map<String, Object> map);
 
-    @PostMapping("api/v1/tms/omstransorders/closeTransOrderByPlan")
-    Map<String, Object> closeTransOrderByPlan(@RequestBody(required = false) Map<String, Object> map);
+    @PostMapping("api/v1/tms/omstransorders/getTransResult")
+    Map<String, Object> getTransResult(Map<String, Object> map);
+
+    @PostMapping("api/v1/tms/tmsenfactoryresults/syncEnfactoryResult")
+    Map<String, Object> syncEnfactoryResult(Map<String, Object> map);
+
+    @PostMapping("api/v1/tms/tmsoutfactoryresults/syncOutfactoryResult")
+    Map<String, Object> syncOutfactoryResult(Map<String, Object> map);
+
+    @PostMapping("api/v1/tms/tmsweightresults/syncWeightResult")
+    Map<String, Object> syncWeightResult(Map<String, Object> map);
+
+
+    @PostMapping("api/v1/tms/omstransorders/saleDispatchOrder")
+    Map<String, Object> saleDispatchOrder(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping("api/v1/tms/omstransorders/getSaleTransOrderList")
+    Map<String, Object> getSaleTransOrderList(@RequestBody(required = false) Map<String, Object> map,
+                                          @RequestParam  Integer apiId,
+                                          @RequestParam  Integer pageNum,
+                                          @RequestParam  Integer pageSize);
+
+    @PostMapping("api/v1/tms/tmsqualityresults/syncQualityResult")
+    Map<String, Object> syncQualityResult(Map<String, Object> map);
+
+    @PostMapping("api/v1/tms/tmssigninresults/signIn")
+    Map<String, Object> signIn(Map<String, Object> map);
+
+    @PostMapping("api/v1/tms/tmsreplacefrontresults/replaceFront")
+    Map<String, Object> replaceFront(Map<String, Object> map);
+
+
+    @PostMapping("api/v1/tms/tmsloadresults/load")
+    Map<String, Object> load(Map<String, Object> map);
+
+    @PostMapping("api/v1/tms/tmsloadresults/loadUpd")
+    Map<String, Object> loadUpd(Map<String, Object> map);
+
+    @PostMapping("api/v1/tms/tmsunloadresults/unload")
+    Map<String, Object> unload(Map<String, Object> map);
+
+    @PostMapping("api/v1/tms/tmsunloadresults/unloadUpd")
+    Map<String, Object> unloadUpd(Map<String, Object> map);
+
+    @PostMapping("api/v1/tms/tmsarrivalresults/arrival")
+    Map<String, Object> arrival(Map<String, Object> map);
+
+    @PostMapping("api/v1/tms/tmsreceiptresults/receipt")
+    Map<String, Object> receipt(Map<String, Object> map);
+
+    @PostMapping("api/v1/tms/omstransorders/getCountEnfactory")
+    Map<String, Object>  getCountEnfactory(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping("api/v1/tms/tmssigninresults/getSignInResultList")
+    Map<String, Object> getSignInResultList(@RequestBody(required = false) Map<String, Object> map,
+                                            @RequestParam  Integer apiId,
+                                            @RequestParam  Integer pageNum,
+                                            @RequestParam  Integer pageSize);
+
+    @PostMapping("api/v1/tms/tmsreplacefrontresults/getReplaceFrontResultList")
+    Map<String, Object> getReplaceFrontResultList(@RequestBody(required = false) Map<String, Object> map,
+                                                  @RequestParam  Integer apiId,
+                                                  @RequestParam  Integer pageNum,
+                                                  @RequestParam  Integer pageSize);
+
+    @PostMapping("api/v1/tms/tmsenfactoryresults/getEnfactoryResultList")
+    Map<String, Object> getEnfactoryResultList(@RequestBody(required = false) Map<String, Object> map,
+                                          @RequestParam  Integer apiId,
+                                          @RequestParam  Integer pageNum,
+                                          @RequestParam  Integer pageSize);
+
+    @PostMapping("api/v1/tms/tmsoutfactoryresults/getOutfactoryResultList")
+    Map<String, Object> getOutfactoryResultList(@RequestBody(required = false) Map<String, Object> map,
+                                              @RequestParam  Integer apiId,
+                                              @RequestParam  Integer pageNum,
+                                              @RequestParam  Integer pageSize);
+
+    @PostMapping("api/v1/tms/tmsloadresults/getLoadResultList")
+    Map<String, Object> getLoadResultList(@RequestBody(required = false) Map<String, Object> map,
+                                                   @RequestParam  Integer apiId,
+                                                   @RequestParam  Integer pageNum,
+                                                   @RequestParam  Integer pageSize);
+
+    @PostMapping("api/v1/tms/tmsunloadresults/getUnloadResultList")
+    Map<String, Object> getUnloadResultList(@RequestBody(required = false) Map<String, Object> map,
+                                          @RequestParam  Integer apiId,
+                                          @RequestParam  Integer pageNum,
+                                          @RequestParam  Integer pageSize);
+
+    @PostMapping("api/v1/tms/tmsweightresults/getWeightResultList")
+    Map<String, Object> getWeightResultList(@RequestBody(required = false) Map<String, Object> map,
+                                            @RequestParam  Integer apiId,
+                                            @RequestParam  Integer pageNum,
+                                            @RequestParam  Integer pageSize);
+
+    @PostMapping("api/v1/tms/tmsqualityresults/getQualityResultList")
+    Map<String, Object> getQualityResultList(@RequestBody(required = false) Map<String, Object> map,
+                                            @RequestParam  Integer apiId,
+                                            @RequestParam  Integer pageNum,
+                                            @RequestParam  Integer pageSize);
+
+    @PostMapping("api/v1/tms/tmsarrivalresults/getArrivalResultList")
+    Map<String, Object> getArrivalResultList(@RequestBody(required = false) Map<String, Object> map,
+                                         @RequestParam  Integer apiId,
+                                         @RequestParam  Integer pageNum,
+                                         @RequestParam  Integer pageSize);
+
+    @PostMapping("api/v1/tms/tmsreceiptresults/getReceiptResultList")
+    Map<String, Object> getReceiptResultList(@RequestBody(required = false) Map<String, Object> map,
+                                         @RequestParam  Integer apiId,
+                                         @RequestParam  Integer pageNum,
+                                         @RequestParam  Integer pageSize);
 }
 
 

src/main/resources/application-prod.yml

@@ -29,7 +29,7 @@ openfeign:
   BmsFeign:
     url: ${BMSFEIGN_URL:172.16.90.214:8078}
   TmsFeign:
-    url: ${TMSFEIGN_URL:localhost:8086}
+    url: ${TMSFEIGN_URL:172.16.90.214:8086}
   WMSFeign:
     url: ${WMSFEIGN_URL:172.16.90.214:8093}
   OMSFeign:

src/main/resources/bootstrap.yml

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

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

@@ -124,7 +124,7 @@
             <if test="index!=null and index!=''">
                 AND REGEXP_LIKE("label", #{index})
             </if>
-           <if test="id!=null and id.size>0">
+           <if test="id!=null and id.size>0 and !(index!=null and index!='')">
                 AND "id" in
                 <foreach collection="id" item="item"  open="(" close=")" separator="," >
                     #{item}
@@ -149,7 +149,7 @@
             <if test="index!=null and index!=''">
                 AND REGEXP_LIKE("label", #{index})
             </if>
-           <if test="id!=null and id.size>0">
+           <if test="id!=null and id.size>0 and !(index!=null and index!='')">
                 AND "id" in
                 <foreach collection="id" item="item"  open="(" close=")" separator="," >
                     #{item}
@@ -174,7 +174,7 @@
             <if test="index!=null and index!=''">
                 AND REGEXP_LIKE("label", #{index})
             </if>
-           <if test="id!=null and id.size>0">
+           <if test="id!=null and id.size>0 and !(index!=null and index!='')">
                 AND "id" in
                 <foreach collection="id" item="item"  open="(" close=")" separator="," >
                     #{item}
@@ -203,7 +203,7 @@
             <if test="index!=null and index!=''">
                 AND REGEXP_LIKE("label", #{index})
             </if>
-            <if test="id!=null and id.size>0">
+            <if test="id!=null and id.size>0 and !(index!=null and index!='')">
                 AND "id" in
                 <foreach collection="id" item="item"  open="(" close=")" separator="," >
                     #{item}
@@ -217,6 +217,7 @@
         select
         PERSONNEL_ID "personnelId",
         PERSONNEL_NAME "personnelName",
+        PERSONNEL_POST "personnelPost",
         PERSONNEL_ID "id",
         PERSONNEL_ID "value",
         PERSONNEL_NAME "label",
@@ -226,10 +227,13 @@
         where DELETED = 0
         )
         <where>
+            <if test="personnelPost!=null and personnelPost!=''">
+                AND "personnelPost" = #{personnelPost}
+            </if>
             <if test="index!=null and index!=''">
                 AND REGEXP_LIKE("label", #{index})
             </if>
-           <if test="id!=null and id.size>0">
+           <if test="id!=null and id.size>0 and !(index!=null and index!='')">
                 AND "id" in
                 <foreach collection="id" item="item"  open="(" close=")" separator="," >
                     #{item}
@@ -258,7 +262,7 @@
             <if test="index!=null and index!=''">
                 AND REGEXP_LIKE("label", #{index})
             </if>
-            <if test="id!=null and id.size>0">
+            <if test="id!=null and id.size>0 and !(index!=null and index!='')">
                 AND "id" in
                 <foreach collection="id" item="item"  open="(" close=")" separator="," >
                     #{item}
@@ -283,7 +287,7 @@
             <if test="index!=null and index!=''">
                 AND REGEXP_LIKE("label", #{index})
             </if>
-           <if test="id!=null and id.size>0">
+           <if test="id!=null and id.size>0 and !(index!=null and index!='')">
                 AND "id" in
                 <foreach collection="id" item="item"  open="(" close=")" separator="," >
                     #{item}
@@ -308,7 +312,7 @@
             <if test="index!=null and index!=''">
                 AND REGEXP_LIKE("label", #{index})
             </if>
-            <if test="id!=null and id.size>0">
+            <if test="id!=null and id.size>0 and !(index!=null and index!='')">
                 AND "id" in
                 <foreach collection="id" item="item"  open="(" close=")" separator="," >
                     #{item}