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

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

@@ -895,6 +895,9 @@ public class AMScontroller{
                                                         Integer pageSize,
                                                         Integer apiId,
                                                         Integer dayplanId){
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
         return amsFeign.getMaterialMesByDayPlanId(mapValue,pageNum,pageSize,apiId,dayplanId);
     }
 
@@ -913,9 +916,22 @@ public class AMScontroller{
         return amsFeign.getRailOffsetDayplan(mapValue, pageNum, pageSize, apiId,dayplanReceiveStatus,carrierId);
     }
 
+    @PostMapping("/getRailOffsetDayplanId")
+    @ApiOperation(value = "根据ID展示钢材发往异地库计划")
+    public Map<String, Object> getRailOffsetDayplanId(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                    Integer pageNum,
+                                                    Integer pageSize,
+                                                    Integer apiId,
+                                                    Integer dayPlanId) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getRailOffsetDayplanId(mapValue, pageNum, pageSize, apiId,dayPlanId);
+    }
+
     @ApiModelProperty(value = "下发钢材发往异地库计划")
     @PostMapping("/issueRailOffsetDayplan")
-    public RESTfulResult issueRailOffsetDayplan(@RequestBody List<Map<String,Object>> mapList) {
+    public Map<String,Object> issueRailOffsetDayplan(@RequestBody List<Map<String,Object>> mapList) {
         return amsFeign.issueRailOffsetDayplan(mapList);
     }
 
@@ -1175,4 +1191,10 @@ public class AMScontroller{
     public Map<String,Object> getdayPlanToTheStationId() {
         return amsFeign.getdayPlanToTheStationId();
     }
+
+    @ApiModelProperty(value = "异地库下拉")
+    @GetMapping("/getOffsetWarehouse")
+    public Map<String,Object> getOffsetWarehouse() {
+        return amsFeign.getOffsetWarehouse();
+    }
 }

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

@@ -1514,6 +1514,15 @@ public class TMSController extends BaseRESTfulController {
         return tmsTrainFeign.addPleaseForNZ(tmstrainLoadingResult);
     }
 
+    @ApiOperation(value="内转新增达州站-厂内装车实绩 ")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "", required = false, dataType = "Map"),
+    })
+        @PostMapping("/addDaZhouToDaGangLoadResult")
+    public Map<String, Object> addDaZhouToDaGangLoadResult(@RequestBody(required = false)Map<String, Object> map){
+        return tmsTruckFeign.addDaZhouToDaGangLoadResult(map);
+    }
+
     @ApiOperation(value = "内转查询请车作业信息")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
@@ -1756,4 +1765,10 @@ public class TMSController extends BaseRESTfulController {
     ){
         return tmsTruckFeign.getAllTimeTaskResult(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, con);
     }
+
+    @ApiOperation(value="新增钢材到异地库达州站驻港人员确定收货")
+    @PostMapping("/addSteelNzReceiptResult")
+    public Map<String, Object> addSteelNzReceiptResult(@RequestBody(required = false) Map<String, Object> map) {
+        return tmsTruckFeign.addSteelNzReceiptResult(map);
+    }
 }

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

@@ -139,7 +139,7 @@ public class UniversalController extends BaseRESTfulController {
     }
 
 
-    @ApiOperation(value="查询所有空闲的运力信息")
+    @ApiOperation(value="通过订单ID查询订单下所有物资")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
             @ApiImplicitParam(name = "apiId(248)", value = "动态表头", required = false, dataType = "Integer"),

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

@@ -95,6 +95,23 @@ public class WMSController extends BaseRESTfulController {
 
     }
 
+    //通过成品仓库网格ID查询实时库存数据
+    @PostMapping("/selectGridMaterialListByGridId")
+    @ApiOperation(value = "通过成品仓库网格ID展示实时库存数据")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId", value = "155", required = false, dataType = "BigDecimal"),
+    })
+    public Map<String,Object> selectGridMaterialListByGridId(BigDecimal gridId) {
+        return wmsFeign.selectGridMaterialListByGridId(gridId);
+
+    }
+
+    //修改物资钢材表的质量是否合格字段和逻辑删除
+    @PostMapping(value = "/updateRmsMaterialSteelDemotion")
+    public Map<String,Object> updateRmsMaterialSteelDemotion(@RequestBody Map<String,Object> map){
+        return wmsFeign.updateRmsMaterialSteelDemotion(map);
+    }
+
     //钢材异地库出库扫描
     @PostMapping("/OutScanResultTag")
     public Map<String, Object> OutScanResultTag(@RequestBody(required = false) Map<String, Object> mapval) {
@@ -177,6 +194,12 @@ public class WMSController extends BaseRESTfulController {
         return wmsFeign.getWmspRestackMakeResultList(mapVal==null?new HashMap<>():mapVal,apiId, pageNum, pageSize, warehouseid, stackingId, gradtionNumber);
     }
 
+    //添加倒垛单实绩
+    @PostMapping(value = "/addRestackMakeResult")
+    public Map<String,Object> addRestackMakeResult(@RequestBody(required = false)List <Map<String,Object>> mapval){
+        return wmsFeign.addRestackMakeResult(mapval);
+    }
+
     //删除倒垛单
     @PostMapping("/deleteByResultId/{resultId}")
     public Map<String, Object> deleteByResultId(@PathVariable Integer resultId) {
@@ -226,7 +249,7 @@ public class WMSController extends BaseRESTfulController {
     }
 
     //修改倒垛单
-    @PostMapping("/addRestackMakeResult")
+    @PostMapping("/editRestackMakeResult")
     public Map<String, Object> editRestackMakeResult(@RequestBody(required = false) Map<String, Object> mapVal) {
         Map<String, Object> resTfulResult = wmsFeign.editRestackMakeResult(mapVal);
         return resTfulResult;

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

@@ -1186,6 +1186,10 @@ public interface AmsFeign {
     @GetMapping("/api/v1/ams/amstruckinwardplan/getCarrierList")
     Map<String, Object> getCarrierList();
 
+    @GetMapping("/api/v1/ams/amstruckinwardrequirement/getOffsetWarehouse")
+    Map<String, Object> getOffsetWarehouse();
+
+
     @PostMapping("/api/v1/ams/amstruckinwardrequirement/getWareHouse")
     Map<String, Object> getWareHouse(@RequestBody(required = false) Map<String,Object> mapValue,
                                      @RequestParam Integer pageNum,
@@ -1211,7 +1215,7 @@ public interface AmsFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/ams/amsrailoffsetdayplan/issueRailOffsetDayplan")
-    RESTfulResult issueRailOffsetDayplan(@RequestBody List<Map<String, Object>> mapList);
+    Map<String,Object> issueRailOffsetDayplan(@RequestBody List<Map<String, Object>> mapList);
 
     /**
      * 到站下拉
@@ -1219,4 +1223,12 @@ public interface AmsFeign {
      */
     @GetMapping("/api/v1/ams/amsrailoffsetdayplan/getdayPlanToTheStationId")
     Map<String, Object> getdayPlanToTheStationId();
+
+
+    @PostMapping(value = "/api/v1/ams/amsrailoffsetdayplan/getRailOffsetDayplanId")
+    Map<String, Object> getRailOffsetDayplanId(@RequestBody(required = false) Map<String, Object> mapValue,
+                                             @RequestParam Integer pageNum,
+                                             @RequestParam Integer pageSize,
+                                             @RequestParam Integer apiId,
+                                             @RequestParam Integer dayPlanId);
 }

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

@@ -313,6 +313,13 @@ public interface TmsTruckFeign {
                                               @RequestParam("pageNum") Integer pageNum,
                                               @RequestParam("pageSize") Integer pageSize,
                                               @RequestParam("con") String con);
+
+    @PostMapping("api/v1/truckTms/tmstruckloadresults/addDaZhouToDaGangLoadResult")
+    Map<String, Object> addDaZhouToDaGangLoadResult(@RequestBody(required = false)Map<String, Object> map);
+
+    @ApiOperation(value="新增钢材到异地库达州站驻港人员确定收货")
+    @PostMapping("/addSteelNzReceiptResult")
+    public Map<String, Object> addSteelNzReceiptResult(@RequestBody(required = false) Map<String, Object> map);
 }
 
 

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

@@ -5,6 +5,7 @@ import com.steerinfo.framework.controller.RESTfulResult;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
@@ -83,6 +84,22 @@ public interface WMSFeign {
                                               @RequestParam Integer pageSize,
                                               @RequestParam String con);
 
+    /**
+     *  通过成品仓库网格ID查询实时库存数据
+     * @param gridId
+     * @return
+     */
+    @RequestMapping(value = "/api/v1/wms/wmspgridmaterials/selectGridMaterialListByGridId",method = RequestMethod.POST)
+    Map<String,Object> selectGridMaterialListByGridId(@RequestParam BigDecimal gridId);
+
+    /**
+     *  修改物资钢材表的质量是否合格字段和逻辑删除
+     * @param map
+     * @return
+     */
+    @PostMapping(value = "/api/v1/wms/wmspgridmaterials/updateRmsMaterialSteelDemotion")
+    Map<String,Object> updateRmsMaterialSteelDemotion(@RequestBody Map<String,Object> map);
+
     /**
      * 钢材异地库出库扫描
      * @param map
@@ -182,7 +199,7 @@ public interface WMSFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/addRestackMakeResult")
-    Map<String,Object> addRestackMakeResult(@RequestBody(required = false)Map<String,Object> mapval);
+    Map<String,Object> addRestackMakeResult(@RequestBody(required = false) List<Map<String,Object>> mapval);
 
     /**
      *   删除倒垛单

src/main/resources/bootstrap.yml

@@ -78,7 +78,6 @@ mybatis:
     #    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
     mapUnderscoreToCamelCase: true
     call-setters-on-nulls: true
-
 server:
   port: 8080
 

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

@@ -152,6 +152,8 @@
         from (
                  select RM.MATERIAL_NAME               "materialName",
                         RM.MATERIAL_THEORETICAL_WEIGHT "materialTheoreticalWeight",
+                        RM.MATERIAL_SPECIFICATION       "materialSpecification",
+                        RM.MATERIAL_MODEL               "materialModel",
                         OOM.ORDER_MATERIAL_NUMBER      "orderMaterialNumber"
 
                  from OMSTRUCK_ORDER_MATERIAL OOM