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

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

@@ -1971,4 +1971,18 @@ public class AMScontroller{
         return amsFeign.closeSteelMaterialId(mapValue);
     }
 
+    @ApiOperation(value = "展示已审核化产焦炭销售订单列表")
+    @PostMapping("/getSaleCokeOrder")
+    public Map<String, Object> getSaleCokeOrder(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                   Integer pageNum,
+                                                   Integer pageSize,
+                                                   Integer apiId,
+                                                   String con,
+                                                   String consigneeSsoId,
+                                                   Integer shipperId,
+                                                   String startTime,
+                                                   String endTime
+    ) {
+        return amsFeign.getSaleCokeOrder(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con,consigneeSsoId,shipperId,startTime,endTime);
+    }
 }

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

@@ -902,4 +902,16 @@ public class OMSController {
     public Map<String, Object> canCapacityEnfactory(@RequestBody Map<String, Object> mapValue) {
         return omsFeign.canCapacityEnfactory(mapValue);
     }
+
+    @ApiOperation(value = "出库信息")
+    @PostMapping("getWarehouseMes")
+    public Map<String, Object> getWarehouseMes(@RequestBody(required = false) Map<String, Object> mapValue,
+                                               @RequestParam(required = false) String startTime,
+                                               @RequestParam(required = false) String endTime,
+                                               @RequestParam(required = false) String con) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return omsFeign.getWarehouseMes(mapValue,startTime,endTime, con);
+    }
 }

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

@@ -2043,9 +2043,10 @@ public class TMSController extends BaseRESTfulController {
                                                 Integer orderType,
                                                 Integer shipperId,
                                                 String receiveName,
-                                                String materialName
+                                                String materialName,
+                                                String wareHouse
     ){
-        return tmsTruckFeign.getAllSaleReport(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime, carrierSsoId,orderType,shipperId,receiveName,materialName);
+        return tmsTruckFeign.getAllSaleReport(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime, carrierSsoId,orderType,shipperId,receiveName,materialName,wareHouse);
     }
 
     @ApiOperation(value="查询销售统计报表筛选过后的总净重")

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

@@ -882,4 +882,36 @@ public class UniversalController extends BaseRESTfulController {
         return success(list);
     }
 
+
+    @ApiModelProperty(value = "边输边查片区")
+    @PostMapping("/getSaleAreaByLike")
+    public RESTfulResult getSaleAreaByLike(@RequestParam("index") String index) {
+        List<Map<String, Object>> list = universalMapper.getSaleAreaByLike(index == null ? "" : index);
+        return success(list);
+    }
+
+    @ApiModelProperty(value = "判断收货客户是否绑定片区")
+    @PostMapping("/isReceiveHaveArea")
+    public RESTfulResult isReceiveHaveArea(@RequestParam Integer receiveId) {
+        BigDecimal areaId = universalMapper.isReceiveHaveArea(receiveId);
+        if (areaId == null) {
+            return failed("该下单客户未绑定销售片区！！！");
+        }
+        return success(areaId);
+    }
+
+    @ApiModelProperty(value = "下单客户绑定片区")
+    @PostMapping("/bandSaleArea")
+    public RESTfulResult bandSaleArea(@RequestBody Map<String,Object> map) {
+        int result = universalMapper.bandSaleArea(map);
+        return success(result);
+    }
+
+    @ApiOperation(value = "查询厂内钢材车辆作业总数")
+    @GetMapping("/getSteelOrderNum")
+    public RESTfulResult getSteelOrderNum(){
+        int i = universalMapper.getSteelOrderNum();
+        return success(i);
+    }
+
 }

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

@@ -1023,7 +1023,10 @@ public class WMSController extends BaseRESTfulController {
         return wmsFeign.undoInbound(inboundId);
     }
 
-
-
+    @PostMapping("/disorderlyOutbound")
+    @ApiOperation(value = "")
+    public Map<String, Object> disorderlyOutbound(@RequestBody Map<String,Object> map){
+        return wmsFeign.disorderlyOutbound(map);
+    }
 }
 

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

@@ -69,7 +69,7 @@ public class WMSHController extends BaseRESTfulController {
 
 
     @PostMapping("getUnLockPortStock")
-    @ApiOperation(value = "展示下游港口港存库库存列表")
+    @ApiOperation(value = "展示万州港口港存库库存列表")
     public RESTfulResult getUnLockPortStock(@RequestBody(required = false) Map<String, Object> mapValue,
                                                   Integer pageNum,
                                                   Integer pageSize,

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

@@ -1721,4 +1721,15 @@ public interface AmsFeign {
     // 展示下发给承运商的车序号和物资
     @PostMapping(value = "/api/v1/ams/amssaleorders/closeSteelMaterialId")
     Map<String, Object> closeSteelMaterialId(@RequestBody Map<String, Object> mapValue);
+
+    @PostMapping(value = "/api/v1/ams/amssaleorders/getSaleCokeOrder")
+    Map<String, Object> getSaleCokeOrder(@RequestBody Map<String, Object> map,
+                                            @RequestParam Integer pageNum,
+                                            @RequestParam Integer pageSize,
+                                            @RequestParam Integer apiId,
+                                            @RequestParam String con,
+                                            @RequestParam String consigneeSsoId,
+                                            @RequestParam Integer shipperId,
+                                            @RequestParam String startTime,
+                                            @RequestParam String endTime);
 }

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

@@ -522,5 +522,11 @@ public interface OmsFeign {
 
     @PostMapping("api/v1/oms/omstruckorders/canCapacityEnfactory")
     Map<String, Object> canCapacityEnfactory(@RequestBody Map<String, Object> mapValue);
+
+    @PostMapping("api/v1/oms/omstruckorders/getWarehouseMes")
+    Map<String, Object> getWarehouseMes(@RequestBody(required = false) Map<String, Object> mapValue,
+                                        @RequestParam(required = false) String startTime,
+                                        @RequestParam(required = false) String endTime,
+                                        @RequestParam(required = false) String con);
 }
 

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

@@ -407,7 +407,8 @@ public interface TmsTruckFeign {
                                          @RequestParam("orderType") Integer orderType,
                                          @RequestParam("shipperId") Integer shipperId,
                                          @RequestParam("receiveName") String receiveName,
-                                         @RequestParam String materialName
+                                         @RequestParam String materialName,
+                                         @RequestParam String wareHouse
     );
 
     @PostMapping("api/v1/truckTms/statisticalReport/getAllSaleReportTotal")

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

@@ -879,4 +879,7 @@ public interface WMSFeign {
 
     @PostMapping("/api/v1/wms/inboundResult/undoInbound")
     Map<String, Object> undoInbound(@RequestParam BigDecimal inboundId);
+
+    @PostMapping("/api/v1/wms/wmspoutboundresults/disorderlyOutbound")
+    Map<String, Object> disorderlyOutbound(@RequestBody Map<String, Object> map);
 }

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

@@ -207,4 +207,13 @@ public interface UniversalMapper {
     int getQueueCount();
     // 下拉下单客户的历史使用过的地址
     List<Map<String, Object>> getReceiverAllPlaceUsed(Integer receiveId);
+    // 片区边输边查
+    List<Map<String, Object>> getSaleAreaByLike(String index);
+    // 判断收货客户是否绑定片区
+    BigDecimal isReceiveHaveArea(Integer receiveId);
+    // 绑定片区
+    int bandSaleArea(Map<String, Object> map);
+
+    int getSteelOrderNum();
+
 }

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

@@ -1047,4 +1047,33 @@
                            ON RRP.ADDRESS_ID = RRA.ADDRESS_ID
         WHERE ASO.RECEIVE_ID = #{receiveId}
     </select>
+
+    <select id="getSaleAreaByLike" parameterType="java.lang.String" resultType="java.util.Map" >
+        SELECT RSA.AREA_ID "id",
+               RSA.AREA_ID "value",
+               RSA.AREA_ID "areaId",
+               RSA.AREA_NAME "label"
+        FROM RMS_SALE_AREA RSA
+        WHERE RSA.AREA_NAME LIKE #{index}
+    </select>
+
+    <select id="isReceiveHaveArea" parameterType="java.lang.Integer" resultType="DECIMAL" >
+        SELECT RC.AREA_ID AS "areaId"
+        FROM RMS_CONSIGNEE RC
+        WHERE RC.CONSIGNEE_ID = #{receiveId}
+    </select>
+
+    <update id="bandSaleArea" parameterType="java.util.Map">
+        UPDATE RMS_CONSIGNEE RC
+        SET RC.AREA_ID = #{areaId}
+        WHERE RC.CONSIGNEE_ID = #{receiveId}
+    </update>
+
+    <select id="getSteelOrderNum" resultType="java.lang.Integer">
+        SELECT COUNT(*) FROM OMSTRUCK_ORDER OO
+        WHERE OO.ORDER_LINE_SEQUENCE &gt;= 1
+        AND   OO.ORDER_STATUS = 5
+        AND   OO.ORDER_TYPE = 1
+    </select>
+
 </mapper>