'暂存'

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

@@ -1204,4 +1204,72 @@ public class AMScontroller{
     public Map<String, Object> finishTruckPlan(@PathVariable("planId") Integer planId){
         return amsFeign.finishTruckPlan(planId);
     }
+
+
+    //零星订单=======================================================================================================================================================
+
+    @ApiModelProperty(value = "查询零星物资订单列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "384", required = false, dataType = "Integer")
+    })
+    @PostMapping("/getSporadicOrdersList")
+    public RESTfulResult getSporadicOrdersList(@RequestBody(required = false) Map<String,Object> mapValue,
+                                            Integer apiId,
+                                            Integer pageNum,
+                                            Integer pageSize,
+                                            Integer orderType,
+                                            Integer issueStatus,
+                                            String con) {
+        return amsFeign.getSporadicOrdersList(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, orderType, issueStatus, con);
+    }
+
+    @ApiModelProperty(value = "查看物资详情")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "385", required = false, dataType = "Integer")
+    })
+    @PostMapping("/seeAllMaterials")
+    public RESTfulResult seeAllMaterials(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                     Integer apiId,
+                                                     Integer pageNum,
+                                                     Integer pageSize,
+                                                     Integer sporadicOrderId,
+                                                     String con){
+        return amsFeign.seeAllMaterials(mapValue,apiId,pageNum,pageSize,sporadicOrderId,con);
+    }
+
+    @ApiOperation(value="逻辑删除零星物资订单")
+    @PostMapping("/deleteSporadicOrders")
+    public Map<String, Object> deleteSporadicOrders(@RequestParam Integer sporadicOrderId) {
+        return amsFeign.deleteSporadicOrders(sporadicOrderId);
+    }
+
+    @ApiOperation(value="下发零星物资订单")
+    @PostMapping("/issueSporadicOrders")
+    public Map<String, Object> issueSporadicOrders(@RequestBody List<Map<String, Object>> mapList) {
+        return amsFeign.issueSporadicOrders(mapList);
+    }
+
+    @ApiOperation(value="新增零星物资进出厂（以及销售钢材退货）")
+    @PostMapping("/addSporadicOrders")
+    public Map<String, Object> addSporadicOrders(@RequestBody Map<String,Object> mapValue) {
+        return amsFeign.addSporadicOrders(mapValue);
+    }
+
+    @ApiOperation(value="查询修改渲染")
+    @PostMapping("/selectSporadicOrder")
+    public RESTfulResult selectSporadicOrder(@RequestParam Integer sporadicOrderId) {
+        return amsFeign.selectSporadicOrder(sporadicOrderId);
+    }
+
+    @ApiOperation(value="修改零星物资订单")
+    @PostMapping("/updateSporadicOrder")
+    public Map<String,Object> updateSporadicOrder(@RequestBody Map<String,Object> mapValue) {
+        return amsFeign.updateSporadicOrder(mapValue);
+    }
+
+
 }

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

@@ -137,7 +137,7 @@ public class UniversalController extends BaseRESTfulController {
     @ApiOperation(value="通过订单ID查询订单下所有物资")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(248)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId(395)", value = "动态表头", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
     })
@@ -298,4 +298,57 @@ public class UniversalController extends BaseRESTfulController {
         List<Map<String, Object>> list = universalMapper.getCarrierMesByLike(index);
         return success(list);
     }
+
+    @ApiModelProperty(value = "模糊查询收货单位")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "396", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping("/queryConsigneeByLike")
+    public RESTfulResult queryConsigneeByLike(@RequestBody(required = false) Map<String,Object> mapValue,
+                                             Integer pageNum,
+                                             Integer pageSize,
+                                             Integer apiId,
+                                             String index) {
+        if(mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        if(index != null){
+            mapValue.put("index","%" + index + "%");
+        }
+        List<Map<String, Object>> list = universalMapper.queryConsigneeByLike(mapValue);
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList = universalMapper.queryConsigneeByLike(mapValue);
+        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 = "395", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping("/selectAllMaterialName")
+    public RESTfulResult selectAllMaterialName(@RequestBody(required = false) Map<String,Object> mapValue,
+                                              Integer pageNum,
+                                              Integer pageSize,
+                                              Integer apiId,
+                                              String index) {
+        if(mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        if(index != null){
+            mapValue.put("index","%" + index + "%");
+        }
+        List<Map<String, Object>> list = universalMapper.selectAllMaterialName(mapValue);
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList = universalMapper.selectAllMaterialName(mapValue);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        return success(data);
+    }
+
 }

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

@@ -1235,4 +1235,37 @@ public interface AmsFeign {
 
     @PostMapping("/api/v1/ams/amstruckinwardplan/finishTruckPlan/{planId}")
     public Map<String, Object> finishTruckPlan(@PathVariable("planId") Integer planId);
+
+    //零星订单================================================================================================================================
+    @PostMapping("/api/v1/ams/amstrucksporadicorders/getSporadicOrdersList")
+    RESTfulResult getSporadicOrdersList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                              @RequestParam Integer apiId,
+                                              @RequestParam Integer pageNum,
+                                              @RequestParam Integer pageSize,
+                                              @RequestParam Integer orderType,
+                                              @RequestParam Integer issueStatus,
+                                              @RequestParam String con);
+
+    @PostMapping("/api/v1/ams/amstrucksporadicorders/seeAllMaterials")
+    RESTfulResult seeAllMaterials(@RequestBody(required = false) Map<String, Object> mapValue,
+                                              @RequestParam Integer apiId,
+                                              @RequestParam Integer pageNum,
+                                              @RequestParam Integer pageSize,
+                                              @RequestParam Integer sporadicOrderId,
+                                              @RequestParam String con);
+
+    @PostMapping("/api/v1/ams/amstrucksporadicorders/deleteSporadicOrders")
+    Map<String, Object> deleteSporadicOrders(@RequestParam Integer sporadicOrderId);
+
+    @PostMapping("/api/v1/ams/amstrucksporadicorders/issueSporadicOrders")
+    Map<String, Object> issueSporadicOrders(@RequestBody List<Map<String, Object>> mapList);
+
+    @PostMapping("/api/v1/ams/amstrucksporadicorders/addSporadicOrders")
+    Map<String, Object> addSporadicOrders(@RequestBody Map<String, Object> mapValue);
+
+    @PostMapping("/api/v1/ams/amstrucksporadicorders/selectSporadicOrder")
+    RESTfulResult selectSporadicOrder(@RequestParam Integer sporadicOrderId);
+
+    @PostMapping("/api/v1/ams/amstrucksporadicorders/updateSporadicOrder")
+    Map<String, Object> updateSporadicOrder(@RequestBody Map<String, Object> mapValue);
 }

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

@@ -45,4 +45,10 @@ public interface UniversalMapper {
 
     //承运商边输边查
     List<Map<String, Object>> getCarrierMesByLike(String index);
+
+    // 收货单位
+    List<Map<String, Object>> queryConsigneeByLike(Map<String, Object> mapValue);
+
+    // 所有物资
+    List<Map<String, Object>> selectAllMaterialName(Map<String, Object> mapValue);
 }

src/main/resources/bootstrap.yml

@@ -25,31 +25,31 @@ eureka:
 
 openfeign:
   ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.33.162:8083}
+    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   AmsFeign:
-    url: ${AMSFEIGN_URL:172.16.33.162:8083}
+    url: ${AMSFEIGN_URL:localhost:8079}
   BmsshipFeign:
-    url: ${BMSSHIPFEIGN_URL:localhost:8078}
+    url: ${BMSSHIPFEIGN_URL:172.16.33.166:8078}
   BmstrainFeign:
-    url: ${BMSTRAINFEIGN_URL:localhost:8077}
+    url: ${BMSTRAINFEIGN_URL:172.16.33.166:8077}
   BmstruckFeign:
-    url: ${BMSTRUCKFEIGN_URL:localhost:8076}
+    url: ${BMSTRUCKFEIGN_URL:172.16.33.166:8076}
   QmsTruckFeign:
-    url: ${QMSTRUCKFEIGN_URL:localhost:8047}
+    url: ${QMSTRUCKFEIGN_URL:172.16.33.166:8047}
   TmsTrainFeign:
-    url: ${TMSTRAINFEIGN_URL:localhost:8086}
+    url: ${TMSTRAINFEIGN_URL:172.16.33.166:8086}
   TmsTruckFeign:
     url: ${TMSTRUCKFEIGN_URL:localhost:8088}
   TmsshipFeign:
-    url: ${TMSSHIPFEIGN_URL:localhost:8090}
+    url: ${TMSSHIPFEIGN_URL:172.16.33.166:8090}
   WMSHFeign:
-    url: ${WMSHFEIGN_URL:localhost:8070}
+    url: ${WMSHFEIGN_URL:172.16.33.166:8070}
   WMSFeign:
-    url: ${WMSFEIGN_URL:localhost:8093}
+    url: ${WMSFEIGN_URL:172.16.33.166:8093}
   OMSFeign:
     url: ${OMSFEIGN_URL:localhost:8095}
   RmsFeign:
-    url: ${RMSFEIGN_HRL:localhost:8060}
+    url: ${RMSFEIGN_HRL:172.16.33.166:8060}
 
 genxml:
   pth: com/a

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

@@ -175,7 +175,11 @@
                  from OMSTRUCK_ORDER_MATERIAL OOM
                           left join RMS_MATERIAL RM
                                     ON RM.MATERIAL_ID = OOM.MATERIAL_ID
-                 where OOM.ORDER_ID = #{orderId}
+                 <where>
+                     <if test="orderId != null" >
+                         OOM.ORDER_ID = #{orderId}
+                     </if>
+                 </where>
              )
         <where>
             <if test="materialName != null">
@@ -201,7 +205,47 @@
             order by "materialName" desc
         </if>
     </select>
-
+    <!--查询所有物资-->
+    <select id="selectAllMaterialName" resultType="java.util.Map" parameterType="java.util.Map">
+        SELECT * FROM (
+        select distinct RM.MATERIAL_NAME "materialName",
+        RM.MATERIAL_SPECIFICATION "materialSpecification",
+        RM.MATERIAL_MODEL "materialModel",
+        RM.MATERIAL_CODE "materialCode",
+        RM.MATERIAL_ID AS "materialId"
+        from RMS_MATERIAL RM
+        <where>
+            <if test="index != null">
+                RM.MATERIAL_NAME like #{index}
+            </if>
+        </where>
+        )
+        <where>
+        <if test="materialName != null">
+        <foreach collection="materialName" item="item" open="(" separator="or" close=")">
+            "materialName" 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>
+            <if test="materialCode != null">
+                and
+                <foreach collection="materialCode" item="item" open="(" separator="or" close=")">
+                    "materialCode" like '%${item}%'
+                </foreach>
+            </if>
+        </where>
+    </select>
 <!--  通过物资ID查询该物资的发货单位信息  -->
     <select id="getSupplierMesByMaterialId" parameterType="java.util.Map" resultType="java.util.Map">
         select *
@@ -358,24 +402,50 @@
         </if>
     </select>
 
-<!-- 边输边查承运商   -->
+    <!-- 边输边查承运商   -->
     <select id="getCarrierMesByLike" parameterType="string" resultType="java.util.Map">
         select
         *
         from(
         select
             RC.CARRIER_ID "carrierId",
-            RC.CARRIER_NAME "carrierName"
+            RC.CARRIER_NAME "value"
         from RMS_CARRIER RC
-        order by "carrierName"
-        )
         <where>
             <if test="index != null">
-                "carrierName"  like #{index}
+                RC.CARRIER_NAME  like #{index}
             </if>
             <if test="index == null">
                 rownum &lt; 10
             </if>
         </where>
+        order by "value"
+        )
+    </select>
+
+    <select id="queryConsigneeByLike" resultType="java.util.Map" parameterType="java.util.Map" >
+        SELECT * FROM (
+        SELECT
+        RCO.CONSIGNEE_COMPANY_NAME AS "consigneeCompanyName",
+        RCO.CONSIGNEE_CODE AS "consigneeCode",
+        RCO.CONSIGNEE_ID AS "consigneeId"
+        FROM RMS_CONSIGNEE RCO
+        <where>
+            <if test="index != null">
+                RCO.CONSIGNEE_COMPANY_NAME like #{index}
+            </if>
+        </where>
+        )
+        <if test="consigneeCompanyName != null">
+            <foreach collection="consigneeCompanyName" item="item" open="(" separator="or" close=")">
+                "consigneeCompanyName" like '%${item}%'
+            </foreach>
+        </if>
+        <if test="consigneeCode != null">
+            and
+            <foreach collection="consigneeCode" item="item" open="(" separator="or" close=")">
+                "consigneeCode" like '%${item}%'
+            </foreach>
+        </if>
     </select>
 </mapper>