wms 修改

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

@@ -341,11 +341,11 @@ public class AMScontroller{
                                               Integer pageNum,
                                               Integer pageSize,
                                               Integer apiId,
-                                              String con) {
+                                              String con,String sendCompId) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return amsFeign.getPurchaseOrderList(mapValue, pageNum, pageSize, apiId, con);
+        return amsFeign.getPurchaseOrderList(mapValue, pageNum, pageSize, apiId, con, sendCompId);
     }
 
     /**
@@ -456,8 +456,8 @@ public class AMScontroller{
      */
     @PostMapping("batchUpdateTransportPriceByOilPrice1")
     @ApiOperation(value = "油价联动导致运价变动，批量修改运价")
-    Map<String, Object> batchUpdateTransportPriceByOilPrice1() {
-        return amsFeign.batchUpdateTransportPriceByOilPrice1();
+    Map<String, Object> batchUpdateTransportPriceByOilPrice1(@RequestBody Map<String,Object> map) {
+        return amsFeign.batchUpdateTransportPriceByOilPrice1(map);
     }
     @GetMapping("getLineNo")
     @ApiOperation(value = "得到线路编号下拉")
@@ -475,6 +475,18 @@ public class AMScontroller{
         return amsFeign.getDeliveryAddress();
     }
 
+    @GetMapping("getCargoName")
+    @ApiOperation(value = "获取货物类型")
+    public Map<String, Object> getCargoName(){
+        return amsFeign.getCargoName();
+    }
+
+    @GetMapping("getOilTypeName")
+    @ApiOperation(value = "获取油品名称")
+    public Map<String, Object> getOilTypeName(){
+        return amsFeign.getOilTypeName();
+    }
+
     @PostMapping("/addAmsDispatchSaleOrder")
     Map<String, Object> addAmsDispatchSaleOrder(@RequestBody(required = false) Map<String, Object> mapVal) {
         return amsFeign.addAmsDispatchSaleOrder(mapVal);

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

@@ -1066,4 +1066,17 @@ public class RMScontroller {
         return rmsFeign.isInHere(personnelJobNumber);
     }
 
+
+    @ApiOperation(value="创建", notes="添加油品名称")
+    @ApiImplicitParam(name = "oilTypeName", value = "油品名称", required = true, dataType = "String")
+    @PostMapping(value = "/addOilType")
+    public Map<String, Object> addOilType(String oilTypeName){
+        return rmsFeign.addOilType(oilTypeName);
+    }
+
+    @ApiOperation(value="创建", notes="查询油品名称")
+    @PostMapping(value = "/oilNameSelect")
+    public Map<String, Object> oilNameSelect(){
+        return rmsFeign.oilNameSelect();
+    }
 }

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

@@ -1940,7 +1940,7 @@ public class TMSController extends BaseRESTfulController {
                                                Integer apiId,
                                                Integer pageNum,
                                                Integer pageSize,
-                                             String startTime, String endTime,
+                                               String startTime, String endTime,
                                                Integer orderType
     ){
         return tmsTruckFeign.getRLFLReport(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime,  orderType);
@@ -1966,21 +1966,6 @@ public class TMSController extends BaseRESTfulController {
         return tmsTruckFeign.getAllSaleReportTotal(mapValue==null?new HashMap<>():mapValue, startTime, endTime, carrierSsoId);
     }
 
-//    @ApiOperation(value="查询内转统计报表")
-//    @PostMapping("/getAllInwardResult")
-//    public Map<String, Object> getAllInwardResult(@RequestBody(required=false) Map<String,Object> mapValue,
-//                                                Integer apiId,
-//                                                Integer pageNum,
-//                                                Integer pageSize,
-//                                                String startTime, String endTime,
-//                                                String carrierSsoId
-//    ){
-//        return tmsTruckFeign.getAllInwardResult(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime, carrierSsoId);
-//    }
-
-
-
-
     @ApiOperation(value="查询零星物资进厂统计报表")
     @PostMapping("/getSporadicSuppliesReport1")
     public Map<String, Object> getSporadicSuppliesReport1(@RequestBody(required=false) Map<String,Object> mapValue,
@@ -2012,4 +1997,15 @@ public class TMSController extends BaseRESTfulController {
     ){
         return tmsTruckFeign.getSporadicSuppliesReport2(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime, carrierSsoId,userId,userIds,con,orderType);
     }
+
+    @ApiOperation(value="查询采购内转运输实绩")
+    @PostMapping("/getPurInwardReport")
+    public Map<String, Object> getPurInwardReport(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                          Integer apiId,
+                                                          Integer pageNum,
+                                                          Integer pageSize,
+                                                          String startTime,
+                                                          String endTime){
+        return tmsTruckFeign.getPurInwardReport(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime);
+    }
 }

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

@@ -158,8 +158,8 @@ public class UniversalController extends BaseRESTfulController {
         if(index != null){
             mapValue.put("index", index);
         }
-        if (con != null&&con.equals("undefined")){
-            mapValue.put("con","%"+con+"%");
+        if (con != null&& !con.equals("undefined")){
+            mapValue.put("con",con);
         }
         if (carrierSsoId != null && carrierSsoId.equals("undefined")) {
             carrierSsoId = null;

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

@@ -229,14 +229,14 @@ public class WMSController extends BaseRESTfulController {
 
     //删除倒垛单
     @PostMapping("/deleteByResultId/{resultId}")
-    public Map<String, Object> deleteByResultId(@PathVariable Integer resultId) {
+    public Map<String, Object> deleteByResultId(@PathVariable String resultId) {
         Map<String, Object> resTfulResult = wmsFeign.deleteByResultId(resultId);
         return resTfulResult;
     }
 
     //下发倒垛单
     @PostMapping("/dispatchDistrubtionStatus/{resultId}")
-    public Map<String, Object> dispatchDistrubtionStatus(@PathVariable Integer resultId) {
+    public Map<String, Object> dispatchDistrubtionStatus(@PathVariable String resultId) {
         Map<String, Object> resTfulResult = wmsFeign.dispatchDistrubtionStatus(resultId);
         return resTfulResult;
     }
@@ -274,6 +274,17 @@ public class WMSController extends BaseRESTfulController {
                                                  Integer DistrubtionStatus) {
         return wmsFeign.selectRestackList(mapVal==null?new HashMap<>():mapVal,apiId, pageNum, pageSize, DistrubtionStatus);
     }
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId", value = "119", required = false, dataType = "BigDecimal"),
+    })
+    @PostMapping("/selectRestackList2")
+    public Map<String, Object> selectRestackList2(@RequestBody(required = false) Map<String, Object> mapVal,
+                                                 Integer pageNum,
+                                                 Integer pageSize,
+                                                 Integer apiId,
+                                                 Integer DistrubtionStatus) {
+        return wmsFeign.selectRestackList2(mapVal==null?new HashMap<>():mapVal,apiId, pageNum, pageSize, DistrubtionStatus);
+    }
 
     @PostMapping("/editRestackMakeResult")
     public Map<String, Object> editRestackMakeResult(@RequestBody(required = false) Map<String, Object> mapVal) {
@@ -774,16 +785,16 @@ public class WMSController extends BaseRESTfulController {
     }
 
 
-    @PostMapping("/createRestackMakeResult")
-    public  RESTfulResult createRestackMakeResult(@RequestParam("keeperId") BigDecimal keeperId,
-                                                  @RequestParam("beforeLevel")BigDecimal  beforeLevel,
-                                                  @RequestParam(name = "afterStackingId",defaultValue = "20")BigDecimal afterStackingId,
-                                                  @RequestParam("afterWarehouseId")BigDecimal afterWarehouseId,
-                                                  @RequestParam("afterBeforeStackingId") BigDecimal afterBeforeStackingId,
-                                                  @RequestParam("resultRemark")String resultRemark,
-                                                  @RequestBody(required = false) List<Map<String,Object>> mps){
-        return wmsFeign.createRestackMakeResult(keeperId,beforeLevel,afterStackingId,afterWarehouseId,afterBeforeStackingId,resultRemark,mps);
-    }
+//    @PostMapping("/createRestackMakeResult")
+//    public  RESTfulResult createRestackMakeResult(@RequestParam("keeperId") BigDecimal keeperId,
+//                                                  @RequestParam("beforeLevel")BigDecimal  beforeLevel,
+//                                                  @RequestParam(name = "afterStackingId",defaultValue = "20")BigDecimal afterStackingId,
+//                                                  @RequestParam("afterWarehouseId")BigDecimal afterWarehouseId,
+//                                                  @RequestParam("afterBeforeStackingId") BigDecimal afterBeforeStackingId,
+//                                                  @RequestParam("resultRemark")String resultRemark,
+//                                                  @RequestBody(required = false) List<Map<String,Object>> mps){
+//        return wmsFeign.createRestackMakeResult(keeperId,beforeLevel,afterStackingId,afterWarehouseId,afterBeforeStackingId,resultRemark,mps);
+//    }
     //PDA根据仓库id查找倒垛单
     @GetMapping("/wmsprestackmakeresults/selectRestackByWarehouseIds")
     public  RESTfulResult selectRestackByWarehouseIds(@RequestParam(required = true) String warehouseid){
@@ -793,5 +804,37 @@ public class WMSController extends BaseRESTfulController {
     public RESTfulResult getRestackMakeTypeResult(@RequestParam("restackMake") String restackMake,@RequestParam("context")String context){
         return wmsFeign.getRestackMakeTypeResult(restackMake,context);
     }
+    //    获取物资类型
+    @PostMapping(value = "/getMaterialTypeList")
+    public Map<String,Object> getMaterialTypeList(@RequestParam("warehouseid") String warehouseid,
+                                                  @RequestParam("stackingId") BigDecimal stackingId,
+                                                  @RequestParam("gradtionNumber") BigDecimal gradtionNumber,
+                                                  @RequestParam("pageNum") Integer pageNum,
+                                                  @RequestParam("pageSize") Integer pageSize,
+                                                  @RequestParam("apiId") Integer apiId){
+        return wmsFeign.getMaterialTypeList(warehouseid,stackingId,gradtionNumber,pageNum,pageSize,apiId);
+    }
+
+//    创建倒垛单
+    @PostMapping(value = "/createRestackMakeResult")
+    public Map<String,Object> createRestackMakeResult(@RequestParam("keeperId") BigDecimal keeperId,
+                                                      @RequestParam("beforeLevel")BigDecimal  beforeLevel,
+                                                      @RequestParam(name = "afterStackingId",defaultValue = "20")BigDecimal afterStackingId,
+                                                      @RequestParam("afterWarehouseId")BigDecimal afterWarehouseId,
+                                                      @RequestParam("afterBeforeStackingId") BigDecimal afterBeforeStackingId,
+                                                      @RequestParam("resultRemark")String resultRemark,
+                                                      @RequestBody(required = false) List<Map<String,Object>> mps){
+        return wmsFeign.createRestackMakeResult(keeperId,beforeLevel,afterStackingId,afterWarehouseId,afterBeforeStackingId,resultRemark,mps);
+    }
+    @ApiOperation("进入出库扫码页面，查询出库物资信息详情")
+    @GetMapping("/wmspoutboundresults/getInitOutboundScanResultMaterialInfo")
+    @ApiImplicitParam(name = "resultId",value = "出库实绩id",paramType = "BigDecimal",required = true)
+    public RESTfulResult getInitOutboundScanResultMaterialInfo(@RequestParam(value = "resultId",required = true) BigDecimal resultId){
+        return wmsFeign.getInitOutboundScanResultMaterialInfo(resultId);
+    }
 
+    @PostMapping("/wmspoutboundresults/deleteGridMaterial")
+    public RESTfulResult deleteGridMaterial(@RequestParam String materialOnlyCode){
+        return wmsFeign.deleteGridMaterial(materialOnlyCode);
+    }
 }

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

@@ -283,7 +283,8 @@ public interface AmsFeign {
     Map<String, Object> getPurchaseOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
                                        @RequestParam Integer pageNum,
                                        @RequestParam Integer pageSize,
-                                       @RequestParam Integer apiId, @RequestParam String con
+                                       @RequestParam Integer apiId, @RequestParam String con,
+                                       @RequestParam String sendCompId
                                              );
 
 
@@ -366,7 +367,7 @@ public interface AmsFeign {
     @ApiImplicitParams({
     })
     @PostMapping(value = "/api/v1/ams/amscontracttruckprices/batchUpdateTransportPriceByOilPrice1")
-    Map<String, Object> batchUpdateTransportPriceByOilPrice1();
+    Map<String, Object> batchUpdateTransportPriceByOilPrice1(@RequestBody Map<String,Object> map);
     /**
      * 获取线路编号
      * @param
@@ -397,6 +398,27 @@ public interface AmsFeign {
     })
     @GetMapping(value = "/api/v1/ams/amscontracttruckprices/getDeliveryAddress")
     Map<String, Object> getDeliveryAddress();
+    /**
+     * 获取货物类型
+     * @param
+     * @return
+     */
+    @ApiOperation(value="获取货物类型")
+    @ApiImplicitParams({
+    })
+    @GetMapping(value = "/api/v1/ams/amscontracttruckprices/getCargoName")
+    Map<String, Object> getCargoName();
+    /**
+     * 获取油品名称
+     * @param
+     * @return
+     */
+    @ApiOperation(value="获取油品名称")
+    @ApiImplicitParams({
+    })
+    @GetMapping(value = "/api/v1/ams/amscontracttruckprices/getOilTypeName")
+    Map<String, Object> getOilTypeName();
+
     /**
      * 新增(固定派单/公开抢单)
      * @param mapVal

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

@@ -579,4 +579,12 @@ public interface RmsFeign {
     @ApiOperation(value = "边输边查收货客户父节点")
     @PostMapping(value = "api/v1/rms/rmspersonnel/isInHere")
     Integer isInHere(@RequestParam String personnelJobNumber);
+
+    @ApiOperation(value="创建", notes="添加油品名称")
+    @PostMapping(value = "api/v1/rms/rmsoilprice/addOilType")
+    Map<String, Object> addOilType(@RequestParam String oilTypeName);
+
+    @ApiOperation(value="创建", notes="查询油品名称")
+    @PostMapping(value = "api/v1/rms/rmsoilprice/oilNameSelect")
+    Map<String, Object> oilNameSelect();
 }

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

@@ -425,6 +425,14 @@ public interface TmsTruckFeign {
                                          @RequestParam("carrierSsoId")   String carrierSsoId
     );
 
+    //采购内转统计报表
+    @PostMapping("api/v1/truckTms/statisticalReport/getPurInwardReport")
+    Map<String, Object> getPurInwardReport(@RequestBody(required = false) Map<String, Object> mapValue,
+                                           @RequestParam Integer apiId,
+                                           @RequestParam Integer pageNum,
+                                           @RequestParam Integer pageSize,
+                                           @RequestParam String startTime,
+                                           @RequestParam String endTime);
 }
 
 

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

@@ -2,6 +2,8 @@ package com.steerinfo.dil.feign;
 
 import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.framework.controller.RESTfulResult;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
@@ -235,7 +237,7 @@ public interface WMSFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/deleteByResultId/{resultId}")
-    Map<String,Object> deleteByResultId(@PathVariable Integer resultId);
+    Map<String,Object> deleteByResultId(@PathVariable String resultId);
 
     /**
      * 下发倒垛单pc端
@@ -243,7 +245,7 @@ public interface WMSFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/dispatchDistrubtionStatus/{resultId}")
-    Map<String,Object> dispatchDistrubtionStatus(@PathVariable Integer resultId);
+    Map<String,Object> dispatchDistrubtionStatus(@PathVariable String resultId);
 
     /**
      * 下拉框获取层次
@@ -279,12 +281,19 @@ public interface WMSFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/selectRestackList")
-    Map<String,Object>       selectRestackList     (@RequestBody(required = false) Map<String,Object> map,
+    Map<String,Object> selectRestackList (@RequestBody(required = false) Map<String,Object> map,
                                                     @RequestParam Integer apiId,
                                                     @RequestParam Integer pageNum,
                                                     @RequestParam Integer pageSize,
                                                     @RequestParam Integer DistrubtionStatus
     );
+    @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/selectRestackList2")
+    Map<String,Object> selectRestackList2(@RequestBody(required = false) Map<String,Object> map,
+                                          @RequestParam Integer apiId,
+                                          @RequestParam Integer pageNum,
+                                          @RequestParam Integer pageSize,
+                                          @RequestParam Integer DistrubtionStatus
+    );
     /**
      *  修改倒垛单
      * @param mapval
@@ -631,17 +640,40 @@ public interface WMSFeign {
     @GetMapping("/api/v1/wms/wmspinbounddistributes/getNewDistribute")
     public  RESTfulResult getNewDistribute( @RequestParam("personnelWorkshopid") Integer personnelWorkshopid);
 
-    @PostMapping("/api/v1/wms/wmsprestackmakeresults/createRestackMakeResult")
-    public  RESTfulResult createRestackMakeResult(@RequestParam("keeperId") BigDecimal keeperId,
-                                                  @RequestParam("beforeLevel")BigDecimal  beforeLevel,
-                                                  @RequestParam(name = "afterStackingId",defaultValue = "20")BigDecimal afterStackingId,
-                                                  @RequestParam("afterWarehouseId")BigDecimal afterWarehouseId,
-                                                  @RequestParam("afterBeforeStackingId") BigDecimal afterBeforeStackingId,
-                                                  @RequestParam("resultRemark")String resultRemark,
-                                                  @RequestBody(required = false) List<Map<String,Object>> mps);
+//
+//    @PostMapping("/api/v1/wms/wmsprestackmakeresults/createRestackMakeResult")
+//    public  RESTfulResult createRestackMakeResult(@RequestParam("keeperId") BigDecimal keeperId,
+//                                                  @RequestParam("beforeLevel")BigDecimal  beforeLevel,
+//                                                  @RequestParam(name = "afterStackingId",defaultValue = "20")BigDecimal afterStackingId,
+//                                                  @RequestParam("afterWarehouseId")BigDecimal afterWarehouseId,
+//                                                  @RequestParam("afterBeforeStackingId") BigDecimal afterBeforeStackingId,
+//                                                  @RequestParam("resultRemark")String resultRemark,
+//                                                  @RequestBody(required = false) List<Map<String,Object>> mps);
     @GetMapping("/api/v1/wms/wmsprestackmakeresults/selectRestackByWarehouseIds")
     public  RESTfulResult selectRestackByWarehouseIds(@RequestParam(required = true) String warehouseid);
     @GetMapping("/api/v1/wms/wmsprestackmaketyperesults/getRestackMakeTypeResult")
     public RESTfulResult getRestackMakeTypeResult(@RequestParam("restackMake") String restackMake,@RequestParam("context")String context);
+
+    @PostMapping(value = "/api/v1/wms/wmspgridmaterials/getMaterialTypeList")
+    Map<String, Object> getMaterialTypeList(@RequestParam("warehouseid") String warehouseid,
+                                            @RequestParam("stackingId") BigDecimal stackingId,
+                                            @RequestParam("gradtionNumber") BigDecimal gradtionNumber,
+                                            @RequestParam(name = "pageNum") Integer pageNum,
+                                            @RequestParam(name = "pageSize") Integer pageSize,
+                                            @RequestParam("apiId") Integer apiId);
+
+    @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/createRestackMakeResult")
+    Map<String, Object> createRestackMakeResult(@RequestParam("keeperId") BigDecimal keeperId,
+                                                @RequestParam("beforeLevel")BigDecimal  beforeLevel,
+                                                @RequestParam(name = "afterStackingId",defaultValue = "20")BigDecimal afterStackingId,
+                                                @RequestParam("afterWarehouseId")BigDecimal afterWarehouseId,
+                                                @RequestParam("afterBeforeStackingId") BigDecimal afterBeforeStackingId,
+                                                @RequestParam("resultRemark")String resultRemark,
+                                                @RequestBody(required = false) List<Map<String,Object>> mps);
+    @GetMapping("/api/v1/wms/wmspoutboundresults/getInitOutboundScanResultMaterialInfo")
+    public RESTfulResult getInitOutboundScanResultMaterialInfo(@RequestParam(value = "resultId",required = true) BigDecimal resultId);
+    @PostMapping("/api/v1/wms/wmspoutboundresults/deleteGridMaterial")
+    public RESTfulResult deleteGridMaterial(@RequestParam String materialOnlyCode);
+
 }
 

src/main/resources/application-dev.yml

@@ -1,8 +1,8 @@
 spring:
   datasource:
     url: jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri
-    password: root123
-    username: dagang
+    password: Dil123789
+    username: dil
     driver-class-name: oracle.jdbc.OracleDriver
   application:
     name: dil-api
@@ -28,7 +28,7 @@ openfeign:
   WMSHFeign:
     url: ${WMSHFEIGN_URL:172.16.33.162:8013}
   WMSFeign:
-    url: ${WMSFEIGN_URL:172.16.33.162:8012}
+    url: ${WMSFEIGN_URL:192.168.1.118:8012}
   OMSFeign:
     url: ${OMSFEIGN_URL:172.16.33.162:8016}
   RmsFeign:

src/main/resources/application-prod.yml

@@ -29,7 +29,7 @@ openfeign:
   WMSHFeign:
     url: ${WMSHFEIGN_URL:172.16.33.166:8070}
   WMSFeign:
-    url: ${WMSFEIGN_URL:192.168.1.118:8012}
+    url: ${WMSFEIGN_URL:172.16.33.166:8093}
   OMSFeign:
     url: ${OMSFEIGN_URL:172.16.33.166:8095}
   RmsFeign:

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
@@ -25,7 +25,6 @@ eureka:
 genxml:
   pth: com/a
 cache:
-
   level: 2
 redis:
   host: 10.10.50.28

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

@@ -158,8 +158,7 @@
                 and (instr(RC.CAPACITY_NUMBER, #{index}) > 0 or instr(RCA.CARRIER_NAME, #{index}) > 0)
             </if>
             <if test="con != null">
-                where "capacityNumber" like #{con} or "carrierName" like #{con} or
-                "remark" like #{con}
+                and instr(RC.INSERT_UPDATE_REMARK,#{con}) > 0
             </if>
         )
         <where>