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

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);
     }
 
     /**

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/WMSController.java

@@ -56,7 +56,7 @@ public class WMSController extends BaseRESTfulController {
         return wmsFeign.getWmspOutboundResult(map==null?new HashMap<>():map,apiId, pageNum, pageSize,con);
     }
 
-    @PostMapping("/insertWmspOutBoundResult")
+    @PostMapping("/wmspoutboundresults/insertWmspOutBoundResult")
     @ApiOperation(value = "新增出单实绩并返回出库单详情")
     public Map<String, Object> insertWmspOutBoundResult(@RequestBody(required = false) Map<String, Object> mapval) {
         Map<String, Object> resTfulResult = wmsFeign.insertWmspOutBoundResult(mapval);
@@ -68,13 +68,13 @@ public class WMSController extends BaseRESTfulController {
         return wmsFeign.deleteWmspOutboundResult(resultId);
     }
 
-    @PostMapping("/insertwmspOutboundScanResult")
+    @PostMapping("/wmspoutboundresults/insertwmspOutboundScanResult")
     public Map<String, Object> insertwmspOutboundScanResult(@RequestBody(required = false) Map<String, Object> map) {
         Map<String, Object> resTfulResult = wmsFeign.insertwmspOutboundScanResult(map);
         return resTfulResult;
     }
 
-    @PostMapping("/outbountResultToSuccess")
+    @PostMapping("/wmspoutboundresults/outbountResultToSuccess")
     public Map<String,Object> outbountResultToSuccess(@RequestParam Integer resultId){
         return wmsFeign.outbountResultToSuccess(resultId);
     }
@@ -646,7 +646,7 @@ public class WMSController extends BaseRESTfulController {
      * @return
      */
     @ApiOperation(value = "新增入库扫描吊牌实绩")
-    @PostMapping("/insertResult")
+    @PostMapping("/inboundScanResult/insertResult")
     @Transactional
     public Map<String, Object> insertResult(@RequestBody(required = false) Map<String, Object> map) {
         return wmsFeign.insertResult(map);
@@ -756,4 +756,20 @@ public class WMSController extends BaseRESTfulController {
     Map<String,Object> IssueToCrane(@RequestBody Map<String, Object> map){
         return wmsFeign.IssueToCrane(map);
     }
+    //新增入库实绩
+    @PostMapping("/inboundResult/insertInboundResult")
+    public  RESTfulResult addInvoice(@RequestParam("userName") String userName,@RequestParam("groupId") BigDecimal groupId,@RequestParam("personnelWorkshopid") BigDecimal personnelWorkshopid, @RequestBody(required = false) List<Map<String, Object>> mapList){
+        return wmsFeign.addInvoice(userName,groupId,personnelWorkshopid,mapList);
+    }
+    //抢单
+    @PostMapping("/wmspinbounddistributes/grabDistribute")
+    public  RESTfulResult grabDistribute( @RequestBody Map<String,Object> mapValue){
+        return wmsFeign.grabDistribute(mapValue);
+    }
+
+    @GetMapping("/wmspinbounddistributes/getNewDistribute")
+    public  RESTfulResult getNewDistribute( @RequestParam("personnelWorkshopid") Integer personnelWorkshopid){
+        return wmsFeign.getNewDistribute(personnelWorkshopid);
+    }
+
 }

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
                                              );
 
 

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/WMSFeign.java

@@ -7,6 +7,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
+import java.text.ParseException;
 import java.util.List;
 import java.util.Map;
 
@@ -611,6 +612,23 @@ public interface WMSFeign {
     //下发给行车工
     @PostMapping("/api/v1/wms/reboundResult/IssueToCrane")
     Map<String,Object> IssueToCrane(@RequestBody Map<String, Object> map);
-
+    //创建组
+    @PostMapping(value ="/api/v1/wms/wmspinboundgroups/createGrop",produces  = "application/json;charset=UTF-8")
+    public RESTfulResult createGrop(@RequestBody Map mapValue);
+    //
+    @PostMapping("/api/v1/wms/inboundScanResult/insertResult")
+    public RESTfulResult insertScanResult(@RequestBody(required = false) Map<String, Object> map) throws ParseException;
+    //新增入库实绩
+    @PostMapping("/api/v1/wms/inboundResult/insertInboundResult")
+    public  RESTfulResult addInvoice(@RequestParam("userName") String userName,@RequestParam("groupId") BigDecimal groupId,@RequestParam("personnelWorkshopid") BigDecimal personnelWorkshopid, @RequestBody(required = false) List<Map<String, Object>> mapList);
+    //加入分组
+    @PostMapping(value ="/api/v1/wms/wmspinboundgroups/joinGroup",produces  = "application/json;charset=UTF-8")
+    public RESTfulResult joinGroup(@RequestBody Map mapValue);
+    //获得抢单信息
+    @PostMapping("/api/v1/wms/wmspinbounddistributes/grabDistribute")
+    public  RESTfulResult grabDistribute( @RequestBody Map<String,Object> mapValue);
+    //抢单
+    @GetMapping("/api/v1/wms/wmspinbounddistributes/getNewDistribute")
+    public  RESTfulResult getNewDistribute( @RequestParam("personnelWorkshopid") Integer personnelWorkshopid);
 }
 

src/main/resources/application-prod.yml

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