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

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

@@ -148,6 +148,14 @@ public class OMSController {
         return omsFeign.undoOrder(map);
     }
 
+    @ApiOperation(value = "撤销已拒绝")
+    @PostMapping("/refuseCtrlZ")
+    public Map<String,Object> refuseCtrlZ(@RequestBody Map<String,Object> map){
+        return omsFeign.refuseCtrlZ(map);
+    }
+
+
+
     @ApiOperation(value="司机接单信息")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),

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);
@@ -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,19 @@ 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/OmsFeign.java

@@ -432,5 +432,9 @@ public interface OmsFeign {
     @ApiOperation(value = "装卸工查询自己所有装了货的订单信息")
     @PostMapping("api/v1/oms/omstruckorderseparates/getAllLoadUnloadResult")
     Map<String, Object> getAllLoadUnloadResult(@RequestBody(required = false) Map<String, Object> mapValue);
+
+    @ApiOperation(value = "撤销已拒绝")
+    @PostMapping("api/v1/oms/omstruckorders/refuseCtrlZ")
+    Map<String, Object> refuseCtrlZ(Map<String, Object> map);
 }
 

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:

src/main/resources/bootstrap.yml

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