合并冲突

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

@@ -1108,20 +1108,20 @@ public class AMScontroller{
         return amsFeign.getArriveName();
     }
 
-    @ApiModelProperty(value = "查询所有的钢材物资")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "apiId", value = "232", required = false, dataType = "BigDecimal")
-    })
-    @PostMapping("/getAllSteelMaterialMes")
-    public Map<String, Object> getAllSteelMaterialMes(@RequestBody(required = false) Map<String,Object> mapValue,
-                                                Integer pageNum,
-                                                Integer pageSize,
-                                                Integer apiId,
-                                                String con) {
-        return amsFeign.getAllSteelMaterialMes(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId, con);
-    }
+//    @ApiModelProperty(value = "查询所有的钢材物资")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "apiId", value = "232", required = false, dataType = "BigDecimal")
+//    })
+//    @PostMapping("/getAllSteelMaterialMes")
+//    public Map<String, Object> getAllSteelMaterialMes(@RequestBody(required = false) Map<String,Object> mapValue,
+//                                                Integer pageNum,
+//                                                Integer pageSize,
+//                                                Integer apiId,
+//                                                String con) {
+//        return amsFeign.getAllSteelMaterialMes(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId, con);
+//    }
 
     @ApiModelProperty(value = "查询PC端公开抢单")
     @ApiImplicitParams({

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

@@ -574,6 +574,12 @@ public class OMSController {
         return omsFeign.apportionInwardOffsetOrder(mapvalue);
     }
 
+    @ApiOperation(value = "查询司机的所有运输订单信息")
+    @PostMapping("/getAllOrderMessage")
+    public List<Map<String,Object>> getAllOrderMessage(@RequestParam String capacityNumber) {
+        return omsFeign.getAllOrderMessage(capacityNumber);
+    }
+
     @ApiOperation(value = "司机确认订单")
     @PostMapping("/driverConfirmation")
     public Map<String,Object> driverConfirmation(@RequestBody(required = false) Map<String,Object> mapvalue) {

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

@@ -224,4 +224,35 @@ public class UniversalController extends BaseRESTfulController {
         PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
         return success(data);
     }
+
+    @ApiModelProperty(value = "模糊查询物资")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "244", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping("/queryMaterialByLike")
+    public RESTfulResult queryMaterialByLike(@RequestBody(required = false) Map<String,Object> mapValue,
+                                             Integer pageNum,
+                                             Integer pageSize,
+                                             Integer apiId,
+                                             String index,
+                                             String startNum) {
+
+        if(mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        if(startNum != null){
+            mapValue.put("startNum", startNum + "%");
+        }
+        if(index != null){
+            mapValue.put("index", "%" + index + "%");
+        }
+        List<Map<String, Object>> list = universalMapper.queryMaterialByLike(mapValue);
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList = universalMapper.queryMaterialByLike(mapValue);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        return success(data);
+    }
 }

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

@@ -62,12 +62,22 @@ public class WMSController extends BaseRESTfulController {
         return resTfulResult;
     }
 
-    @PostMapping("/insertWmspOutboundScanResult")
-    public Map<String, Object> insertWmspOutboundScanResult(@RequestBody(required = false) Map<String, Object> mapval) {
-        Map<String, Object> resTfulResult = wmsFeign.insertWmspOutboundScanResult(mapval);
+    @PostMapping(value = "/deletewmspOutboundResult")
+    public Map<String,Object> deleteWmspOutboundResult(@RequestParam Integer resultId){
+        return wmsFeign.deleteWmspOutboundResult(resultId);
+    }
+
+    @PostMapping("/insertwmspOutboundScanResult")
+    public Map<String, Object> insertwmspOutboundScanResult(@RequestBody(required = false) Map<String, Object> map) {
+        Map<String, Object> resTfulResult = wmsFeign.insertwmspOutboundScanResult(map);
         return resTfulResult;
     }
 
+    @PostMapping("/outbountResultToSuccess")
+    public Map<String,Object> outbountResultToSuccess(@RequestParam Integer resultId){
+        return wmsFeign.outbountResultToSuccess(resultId);
+    }
+
     @PostMapping("/updataResultStatus")
     public Map<String, Object> updataResultStatus(@RequestParam Integer resultId) {
         Map<String, Object> resTfulResult = wmsFeign.updataResultStatus(resultId);
@@ -490,7 +500,7 @@ public class WMSController extends BaseRESTfulController {
     @ApiOperation("新增入库实绩")
     @PostMapping("/insertInboundResult")
     @Transactional
-    public String addInvoice(@RequestBody List<Map<String, Object>> mapList) {
+    public Map<String,Object> addInvoice(@RequestBody List<Map<String, Object>> mapList) {
         /*
         获取入库物资件数
          */
@@ -498,15 +508,15 @@ public class WMSController extends BaseRESTfulController {
         /*
         获取入库垛位
          */
-        Map<String, Object> map1 = qmsFeign.getStackingId(new BigDecimal(1), size);
-        String stackNo = (String) map1.get("stackNo");
-        BigDecimal stackId = new BigDecimal(map1.get("stackId").toString());
-        for (Map<String, Object> map : mapList
-        ) {
-            map.put("stackingId", stackId);
-        }
-        wmsFeign.insertInboundResult(mapList);
-        return stackNo;
+//        Map<String, Object> map1 = qmsFeign.getStackingId(new BigDecimal(1), size);
+//        String stackNo = (String) map1.get("stackNo");
+//        BigDecimal stackId = new BigDecimal(map1.get("stackId").toString());
+//        for (Map<String, Object> map : mapList
+//        ) {
+//            map.put("stackingId", stackId);
+//        }
+
+        return wmsFeign.insertInboundResult(mapList);
     }
 
     /**
@@ -638,4 +648,72 @@ public class WMSController extends BaseRESTfulController {
     }
 
 
+    @PostMapping("/selectScanResultByIboundResultId")
+    @ApiOperation(value = "根据入库实绩id获得扫描实绩数据")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId", value = "", required = false, dataType = "BigDecimal"),
+    })
+    public RESTfulResult selectScanResultByIboundResultId(Map<String, Object> mapValue,
+                                                          Integer apiId,
+                                                          Integer pageNum,
+                                                          Integer pageSize) {
+        return wmsFeign.selectScanResultByIboundResultId(mapValue, apiId, pageNum, pageSize);
+    }
+
+    @PostMapping("/getIvboundMakeResultList")
+    @ApiOperation(value = "展示倒库列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId", value = "372", required = false, dataType = "BigDecimal"),
+    })
+    public RESTfulResult getIvboundMakeResultList(Map<String, Object> mapValue,
+                                                          Integer pageNum,
+                                                          Integer pageSize,
+                                                  Integer apiId,
+                                                  String con) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return wmsFeign.getIvboundMakeResultList(mapValue, pageNum, pageSize, apiId, con);
+    }
+
+    /**
+     * 新增倒库作业
+     * @param mapValue
+     * @return
+     */
+    @PostMapping(value = "/addIvboundMakeResult")
+    public Map<String,Object> addIvboundMakeResult(@RequestBody Map<String,Object> mapValue) {
+        return wmsFeign.addIvboundMakeResult(mapValue);
+    }
+
+    /**
+     * 逻辑删除倒库作业
+     * @param resultId
+     * @return
+     */
+    @PostMapping(value = "/deleteIvboundMakeResult/{resultId}")
+    public Map<String,Object> deleteIvboundMakeResult(@PathVariable("resultId") Integer resultId) {
+        return wmsFeign.deleteIvboundMakeResult(resultId);
+    }
+
+    /**
+     * 查询倒库作业
+     * @param resultId
+     * @return
+     */
+    @PostMapping(value = "/selectIvboundMakeResult/{resultId}")
+    public List<Map<String,Object>> selectIvboundMakeResult(@PathVariable("resultId") Integer resultId) {
+        return wmsFeign.selectIvboundMakeResult(resultId);
+    }
+
+    /**
+     * 修改倒库作业
+     * @param mapValue
+     * @return
+     */
+    @PostMapping(value = "/updateIvboundMakeResult")
+    public Map<String,Object> updateIvboundMakeResult(@RequestBody Map<String,Object> mapValue) {
+        return wmsFeign.updateIvboundMakeResult(mapValue);
+    }
+
 }

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

@@ -1156,12 +1156,12 @@ public interface AmsFeign {
     @PostMapping(value = "/api/v1/ams/amsdispatchsaleorders/getLockDispatchSaleOrderList")
     Map<String, Object> getLockDispatchSaleOrderList(@RequestParam Integer carrierId);
 
-    @PostMapping("/api/v1/ams/amssaleplans/getAllSteelMaterialMes")
-    public Map<String, Object> getAllSteelMaterialMes(@RequestBody(required = false) Map<String,Object> mapValue,
-                                                      @RequestParam Integer pageNum,
-                                                      @RequestParam Integer pageSize,
-                                                      @RequestParam Integer apiId,
-                                                      @RequestParam String con) ;
+//    @PostMapping("/api/v1/ams/amssaleplans/getAllSteelMaterialMes")
+//    public Map<String, Object> getAllSteelMaterialMes(@RequestBody(required = false) Map<String,Object> mapValue,
+//                                                      @RequestParam Integer pageNum,
+//                                                      @RequestParam Integer pageSize,
+//                                                      @RequestParam Integer apiId,
+//                                                      @RequestParam String con) ;
 
     @PostMapping("/api/v1/ams/amsdispatchsaleorders/getPCDispatchSaleOrderList")
     Map<String, Object> getPCDispatchSaleOrderList(@RequestBody(required = false) Map<String,Object> mapValue,

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

@@ -278,7 +278,7 @@ public interface OmsFeign {
     @PostMapping(value = "api/v1/oms/omstruckorders/closeOmstruckOrder")
     Map<String, Object> closeOmstruckOrder(@RequestParam Integer orderId);
 
-    @ApiOperation(value="根据运单id关闭订单")
+    @ApiOperation(value="车牌")
     @PostMapping(value = "api/v1/oms/omstruckorders/getCapacityAndDriverList")
     Map<String, Object> getCapacityAndDriverList(@RequestBody(required=false) Map<String,Object> mapValue,
                                                  @RequestParam Integer apiId,
@@ -322,6 +322,9 @@ public interface OmsFeign {
     @PostMapping("api/v1/oms/omstruckorders/apportionInwardOffsetOrder")
     Map<String, Object> apportionInwardOffsetOrder(@RequestBody Map<String, Object> mapvalue);
 
+    @ApiOperation(value = "查询司机的所有运输订单信息")
+    @PostMapping("api/v1/oms/omstruckorders/getAllOrderMessage")
+    List<Map<String,Object>> getAllOrderMessage(@RequestParam String capacityNumber);
     @PostMapping("api/v1/oms/omstruckorders/driverConfirmation")
     Map<String,Object> driverConfirmation(@RequestBody(required = false) Map<String,Object> mapvalue);
 

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

@@ -51,13 +51,29 @@ public interface WMSFeign {
     @RequestMapping(value = "/api/v1/wms/wmspoutboundresults/insertWmspOutBoundResult",method = RequestMethod.POST)
     Map<String,Object> insertWmspOutBoundResult(@RequestBody(required = false) Map<String, Object> mapval);
 
+    /**
+     * 逻辑删除出库单
+     * @param resultId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/wms/wmspoutboundresults/deletewmspOutboundResult")
+    Map<String,Object> deleteWmspOutboundResult(@RequestParam Integer resultId);
+
     /**
      * 新增出库扫描实绩
-     * @param mapval
+     * @param map
      * @return
      */
-    @PostMapping(value = "/api/v1/wms/wmspoutboundscanresults/insertWmspOutboundScanResult")
-    Map<String,Object> insertWmspOutboundScanResult(@RequestBody(required = false) Map<String, Object> mapval);
+    @PostMapping(value = "/api/v1/wms/wmspoutboundresults/insertwmspOutboundScanResult")
+    Map<String,Object> insertwmspOutboundScanResult(@RequestBody(required = false) Map<String, Object> map);
+
+    /**
+     * 装卸工PDA前端点击出库
+     * @param resultId
+     * @return
+     */
+    @PostMapping("/api/v1/wms/wmspoutboundresults/outbountResultToSuccess")
+    Map<String,Object> outbountResultToSuccess(@RequestParam Integer resultId);
 
     /**
      * 更新出库状态
@@ -446,7 +462,7 @@ public interface WMSFeign {
      * @return
      */
     @RequestMapping(value = "/api/v1/wms/inboundResult/insertInboundResult",method = RequestMethod.POST)
-    String insertInboundResult(@RequestBody List<Map<String, Object>> mapList);
+    Map<String,Object> insertInboundResult(@RequestBody List<Map<String, Object>> mapList);
 
     /**
      * 新增退库实绩，返回选择垛位
@@ -512,5 +528,31 @@ public interface WMSFeign {
      */
     @PostMapping(value = "/api/vi/wms/wmsprestackscanresults/selectMaterialSteelIdByReusltId")
     Map<String, Object> selectMaterialSteelIdByReusltId(@RequestBody(required = false) Map<String, Object> map);
+
+    @RequestMapping(value = "/api/v1/wms/inboundResult/selectScanResultByIboundResultId",method = RequestMethod.POST)
+    RESTfulResult selectScanResultByIboundResultId(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                   @RequestParam Integer apiId,
+                                                   @RequestParam Integer pageNum,
+                                                   @RequestParam Integer pageSize);
+
+    @RequestMapping(value = "/api/v1/wms/wmspivboundmakeresult/getIvboundMakeResultList",method = RequestMethod.POST)
+    RESTfulResult getIvboundMakeResultList(@RequestBody(required = false)Map<String, Object> mapValue,
+                                           @RequestParam Integer pageNum,
+                                           @RequestParam Integer pageSize,
+                                           @RequestParam Integer apiId,
+                                           @RequestParam String con);
+
+    @PostMapping(value = "/api/v1/wms/wmspivboundmakeresult/addIvboundMakeResult")
+    Map<String, Object> addIvboundMakeResult(@RequestBody Map<String, Object> mapValue);
+
+    @PostMapping(value = "/api/v1/wms/wmspivboundmakeresult/deleteIvboundMakeResult/{resultId}")
+    Map<String, Object> deleteIvboundMakeResult(@PathVariable("resultId") Integer resultId);
+
+    @PostMapping(value = "/api/v1/wms/wmspivboundmakeresult/selectIvboundMakeResult/{resultId}")
+    List<Map<String, Object>> selectIvboundMakeResult(@PathVariable("resultId") Integer resultId);
+
+    @PostMapping(value = "/api/v1/wms/wmspivboundmakeresult/updateIvboundMakeResult")
+    Map<String, Object> updateIvboundMakeResult(@RequestBody Map<String, Object> mapValue);
+
 }
 

src/main/java/com/steerinfo/dil/mapper/UniversalMapper.java

@@ -37,5 +37,7 @@ public interface UniversalMapper {
     //模糊查询所有的卸货点信息
     List<Map<String, Object>> getUnloadingMesByLike(Map<String, Object> map);
 
+    //模糊查询所有物资
+    List<Map<String, Object>> queryMaterialByLike(Map<String, Object> map);
 
 }

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

@@ -258,4 +258,57 @@
         </if>
     </select>
 
+    <!--  模糊查询所有物资  -->
+    <select id="queryMaterialByLike" parameterType="java.util.Map" resultType="java.util.Map">
+        SELECT *
+        FROM (
+        SELECT RM.MATERIAL_ID "materialId",
+        RM.MATERIAL_NAME "materialName",
+        RM.MATERIAL_CODE "materialCode",
+        RM.MATERIAL_SPECIFICATION "materialSpecification",
+        RM.MATERIAL_MODEL "materialModel"
+        FROM RMS_MATERIAL RM
+        <where>
+            <if test="startNum != null">
+                RM.MATERIAL_CODE LIKE #{startNum}
+            </if>
+            <if test="startNum == null">
+                RM.MATERIAL_CODE LIKE '010%' OR RM.MATERIAL_CODE LIKE '0801%'
+            </if>
+        </where>
+        )
+        <where>
+            <if test="index != null">
+                "materialName" LIKE #{index}
+            </if>
+            <if test="materialName != null">
+                and
+                <foreach collection="materialName" item="item" open="(" separator="or" close=")">
+                    "materialName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="materialCode != null">
+                and
+                <foreach collection="materialCode" item="item" open="(" separator="or" close=")">
+                    "materialCode" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="materialSpecification != null">
+                and
+                <foreach collection="materialSpecification" item="item" open="(" separator="or" close=")">
+                    "materialSpecification" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="materialModel != null">
+                and
+                <foreach collection="materialModel" item="item" open="(" separator="or" close=")">
+                    "materialModel" like '%${item}%'
+                </foreach>
+            </if>
+        </where>
+        <include refid="orderBy"></include>
+        <if test="orderField == null  ">
+            order by "materialId" desc
+        </if>
+    </select>
 </mapper>