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

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

@@ -1955,4 +1955,10 @@ public class AMScontroller{
         return amsFeign.updateCapacityNumberInFactory(mapValue);
     }
 
+    @ApiModelProperty(value = "展示下发给承运商的车序号和物资")
+    @PostMapping("/getCarrierTruckNoAndMaterialList")
+    public Map<String,Object> getCarrierTruckNoAndMaterialList(@RequestBody Map<String,Object> map) {
+        return amsFeign.getCarrierTruckNoAndMaterialList(map);
+    }
+
 }

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

@@ -868,6 +868,13 @@ public class TMSController extends BaseRESTfulController {
         return tmsTrainFeign.getArrivalStationName();
     }
 
+    @ApiOperation(value = "装车新增港存库出库")
+    @PostMapping(value = "/addWarehouseOutResult")
+    public Map<String, Object> addWarehouseOutResult(@RequestBody(required = false) Map<String,Object> map) {
+        return tmsTrainFeign.addWarehouseOutResult(map);
+    }
+
+
     @ApiOperation(value = "获取批次ID")
     @GetMapping(value = "/getBatchId")
     public Map<String, Object> getBatchId() {
@@ -2401,4 +2408,21 @@ public class TMSController extends BaseRESTfulController {
         System.out.println(map);
         return tmsTrainFeign.getPurchaseOrderList(map,apiId,pageNum,pageSize,materialName, resultForeignShipName);
     }
+
+    @ApiOperation(value = "销售钢材统计报表")
+    @PostMapping("/getSaleSteelReport")
+    public Map<String,Object> getSaleSteelReport(@RequestBody(required = false)Map<String,Object>map,
+                                                 String startTime,
+                                                 String endTime,
+                                                 String carrierSsoId,
+                                                 String receiveName,
+                                                 String materialName,
+                                                 String specification,
+                                                 String remark,
+                                                 String saler){
+        if(map==null){
+            map=new HashMap<>();
+        }
+        return tmsTruckFeign.getSaleSteelReport(map,startTime,endTime,carrierSsoId,receiveName,materialName,specification,remark,saler);
+    }
 }

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

@@ -869,4 +869,17 @@ public class UniversalController extends BaseRESTfulController {
     public RESTfulResult updateDriverTel(@RequestBody Map<String,Object> map){
         return success(universalMapper.updateDriverTel(map));
     }
+
+    @GetMapping("/getQueueCount")
+    public RESTfulResult getQueueCount(){
+        return success(universalMapper.getQueueCount());
+    }
+
+    @ApiModelProperty(value = "下拉下单客户的历史使用过的地址")
+    @PostMapping("/getReceiverAllPlaceUsed")
+    public RESTfulResult getReceiverAllPlaceUsed(@RequestParam Integer receiveId) {
+        List<Map<String, Object>> list = universalMapper.getReceiverAllPlaceUsed(receiveId);
+        return success(list);
+    }
+
 }

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

@@ -1709,4 +1709,8 @@ public interface AmsFeign {
     // 修改厂内未装货车辆的运单车牌号
     @PostMapping(value = "/api/v1/ams/amssaleorders/updateCapacityNumberInFactory")
     Map<String,Object> updateCapacityNumberInFactory(@RequestBody Map<String, Object> mapValue);
+
+    // 展示下发给承运商的车序号和物资
+    @PostMapping(value = "/api/v1/ams/amssaleorders/getCarrierTruckNoAndMaterialList")
+    Map<String, Object> getCarrierTruckNoAndMaterialList(@RequestBody Map<String, Object> map);
 }

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

@@ -282,4 +282,8 @@ public interface TmsTrainFeign {
                                                    @RequestParam("pageSize") Integer pageSize,
                                                    @RequestParam("materialName")String materialName,
                                                    @RequestParam("resultForeignShipName")String resultForeignShipName);
+
+
+    @PostMapping(value = "api/v1/trainTms/tmstrainloadingresults/addWarehouseOutResult")
+    Map<String, Object> addWarehouseOutResult(@RequestBody(required = false)Map<String,Object> map);
 }

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

@@ -702,6 +702,17 @@ public interface TmsTruckFeign {
                                                 @RequestParam("orgCode")String orgCode,
                                                 @RequestParam("isPage")String isPage,
                                                 @RequestParam("index")String index);
+
+    @PostMapping("/api/v1/truckTms/statisticalReport/getSaleSteelReport")
+    Map<String, Object> getSaleSteelReport(@RequestBody(required = false)Map<String, Object> map,
+                                           @RequestParam("startTime")String startTime,
+                                           @RequestParam("endTime")String endTime,
+                                           @RequestParam("carrierSsoId")String carrierSsoId,
+                                           @RequestParam("receiveName")String receiveName,
+                                           @RequestParam("materialName")String materialName,
+                                           @RequestParam("specification")String specification,
+                                           @RequestParam("remark")String remark,
+                                           @RequestParam("saler") String saler);
 }
 
 

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

@@ -203,4 +203,8 @@ public interface UniversalMapper {
     int updateSaleOrderStatusById(BigDecimal saleOrderId);
     // 修改司机电话
     int updateDriverTel(Map<String, Object> map);
+
+    int getQueueCount();
+    // 下拉下单客户的历史使用过的地址
+    List<Map<String, Object>> getReceiverAllPlaceUsed(Integer receiveId);
 }

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

@@ -444,7 +444,8 @@
         select
             RC.CARRIER_ID "carrierId",
             RC.CARRIER_NAME "value",
-            RC.CARRIER_NAME "carrierName"
+            RC.CARRIER_NAME "carrierName",
+            RC.CARRIER_ABBREVIATION "value1"
         from RMS_CARRIER RC
         where
             instr(RC.CARRIER_NAME, #{index}) > 0 and rownum < 10
@@ -1015,10 +1016,35 @@
         from RMS_CONSIGNEE RC
         WHERE RC.CONSIGNEE_SSO_ID = #{userId}
     </select>
+    <select id="getQueueCount" resultType="java.lang.Integer">
+        SELECT count(*)
+        FROM (SELECT QQL.LIST_ID "soleP"
+              FROM QMS_QUEUE_LIST QQL
+              WHERE QQL.ENTRY_SURE_TIME is null
+              union all
+              SELECT QQSL.SPELLING_RESULT_ID "soleP"
+              from QMS_QUEUE_SPELLING_LIST QQSL
+              WHERE QQSL.ENTRY_SURE_TIME is null)
+    </select>
 
     <update id="updateDriverTel" parameterType="java.util.Map">
         UPDATE OMSTRUCK_ORDER OO
         SET OO.DRIVER_TEL = #{driverTel}
         WHERE OO.ORDER_ID = #{orderId}
     </update>
+
+    <select id="getReceiverAllPlaceUsed" parameterType="java.lang.Integer" resultType="java.util.Map" >
+        SELECT RRP.PLACE_ID   AS "placeId",
+               RRP.ADDRESS_ID AS "addressId",
+               RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT || RRA.ADDRESS_TOWN AS "address",
+               RRP.ADDRESS_DELIVERY_ADDRESS AS "place"
+        FROM AMS_SALE_ORDER ASO
+                 LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
+                           ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
+                 LEFT JOIN RMS_RECEIVE_PLACE RRP
+                           ON ASOM.SALE_SHIPPING_ADDRESS_ID = RRP.PLACE_ID
+                 LEFT JOIN RMS_RECEIVE_ADDRESS RRA
+                           ON RRP.ADDRESS_ID = RRA.ADDRESS_ID
+        WHERE ASO.RECEIVE_ID = #{receiveId}
+    </select>
 </mapper>