内转钢材到异地库

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

@@ -1620,6 +1620,13 @@ public class AMScontroller{
         return amsFeign.dispatchTruckOrderBySale(mapValue);
     }
 
+    @ApiOperation(value="销售公司直接选择车牌号派发内转钢材运输订单")
+    @PostMapping("/dispatchInwardTruckOrderBySale")
+    public Map<String,Object> dispatchInwardTruckOrderBySale(@RequestBody Map<String,Object> mapValue){
+        return amsFeign.dispatchInwardTruckOrderBySale(mapValue);
+    }
+
+
     @ApiOperation(value="展示销售焦炭订单")
     @PostMapping("/getCokeSaleOrderList")
     public RESTfulResult getCokeSaleOrderList(@RequestBody(required = false) Map<String,Object> mapValue,
@@ -2008,4 +2015,18 @@ public class AMScontroller{
     ) {
         return amsFeign.getRangePoint(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
     }
+
+    @ApiOperation(value = "更新内转钢材收货客户")
+    @PostMapping("/updateInwardConsignee")
+    public Map<String,Object> updateInwardConsignee(@RequestBody(required = false)Map<String,Object>map){
+        return amsFeign.updateInwardConsignee(map);
+    }
+
+    @ApiOperation(value = "查询库存调拨单")
+    @PostMapping("getKucunList")
+    public Map<String,Object> getKucunList(@RequestBody(required = false) Map<String,Object> map,
+                                           String startTime,
+                                           String endTime){
+        return amsFeign.getKucunList(map==null?new HashMap<>():map,startTime,endTime);
+    }
 }

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

@@ -2499,4 +2499,49 @@ public class TMSController extends BaseRESTfulController {
         }
         return tmsTruckFeign.getSaleSteelReport(map,startTime,endTime,carrierSsoId,receiveName,materialName,specification,remark,capacityNo,carrierName,consigneeName,saler);
     }
+
+
+
+
+    @ApiOperation(value = "销售钢材统计报表")
+    @PostMapping("/getInwardSaleSteelReport")
+    public Map<String,Object> getInwardSaleSteelReport(@RequestBody(required = false)Map<String,Object>map,
+                                                 String startTime,
+                                                 String endTime,
+                                                 String carrierSsoId,
+                                                 String receiveName,
+                                                 String materialName,
+                                                 String specification,
+                                                 String remark,
+                                                 String capacityNo,
+                                                 String carrierName,
+                                                 String consigneeName,
+                                                 String saler){
+        if(map==null){
+            map=new HashMap<>();
+        }
+        return tmsTruckFeign.getInwardSaleSteelReport(map,startTime,endTime,carrierSsoId,receiveName,materialName,specification,remark,capacityNo,carrierName,consigneeName,saler);
+    }
+
+    @ApiOperation(value = "销售钢材派单列表")
+    @PostMapping("/getInwardSaleSteelOrder")
+    public Map<String,Object> getInwardSaleSteelOrder(@RequestBody(required = false)Map<String,Object>map,
+                                                       String startTime,
+                                                       String endTime,
+                                                       String carrierSsoId,
+                                                       String receiveName,
+                                                       String materialName,
+                                                       String specification,
+                                                       String remark,
+                                                       String capacityNo,
+                                                       String carrierName,
+                                                       String consigneeName,
+                                                       String saler){
+        if(map==null){
+            map=new HashMap<>();
+        }
+        return tmsTruckFeign.getInwardSaleSteelOrder(map,startTime,endTime,carrierSsoId,receiveName,materialName,specification,remark,capacityNo,carrierName,consigneeName,saler);
+    }
+
+
 }

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

@@ -1503,6 +1503,9 @@ public interface AmsFeign {
     @PostMapping(value = "api/v1/ams/amssaleordermaterials/dispatchTruckOrderBySale")
     Map<String, Object> dispatchTruckOrderBySale(Map<String, Object> mapValue);
 
+    @PostMapping(value = "api/v1/ams/amssaleordermaterials/dispatchInwardTruckOrderBySale")
+    Map<String, Object> dispatchInwardTruckOrderBySale(Map<String, Object> mapValue);
+
     @PostMapping(value = "api/v1/ams/amssaleorders/getCokeSaleOrderList")
     RESTfulResult getCokeSaleOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
                                                    @RequestParam("pageNum") Integer pageNum,
@@ -1746,4 +1749,14 @@ public interface AmsFeign {
                                       @RequestParam Integer apiId,
                                       @RequestParam String con);
 
+
+
+    @PostMapping(value = "/api/v1/ams/amssaleordermaterials/updateInwardConsignee")
+    Map<String, Object> updateInwardConsignee(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping(value = "/api/v1/ams/amssaleorders/getKucunList")
+    Map<String, Object> getKucunList(@RequestBody(required = false) Map<String, Object> map,
+                                     @RequestParam String startTime,
+                                     @RequestParam String endTime);
+
 }

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

@@ -718,6 +718,35 @@ public interface TmsTruckFeign {
                                            @RequestParam("consigneeName") String consigneeName,
                                            @RequestParam("saler") String saler
                                            );
+
+    @PostMapping("/api/v1/truckTms/statisticalReport/getInwardSaleSteelReport")
+    Map<String, Object> getInwardSaleSteelReport(@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("capacityNo") String capacityNo,
+                                                 @RequestParam("carrierName") String carrierName,
+                                                 @RequestParam("consigneeName") String consigneeName,
+                                                 @RequestParam("saler") String saler);
+
+    @PostMapping("/api/v1/truckTms/statisticalReport/getInwardSaleSteelOrder")
+    Map<String, Object> getInwardSaleSteelOrder(@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("capacityNo") String capacityNo,
+                                                 @RequestParam("carrierName") String carrierName,
+                                                 @RequestParam("consigneeName") String consigneeName,
+                                                 @RequestParam("saler") String saler);
+
 }
 
 

src/main/resources/application-dev.yml

@@ -44,13 +44,13 @@ openfeign:
   TmsshipFeign:
     url: ${TMSSHIPFEIGN_URL:172.16.33.162:8003}
   WMSHFeign:
-    url: ${WMSHFEIGN_URL:172.16.33.162:8013}
+    url: ${WMSHFEIGN_URL:localhost:8070}
   WMSFeign:
     url: ${WMSFEIGN_URL:localhost:8012}
   OMSFeign:
     url: ${OMSFEIGN_URL:localhost:8016}
   RmsFeign:
-    url: ${RMSFEIGN_HRL:172.16.33.162:8060}
+    url: ${RMSFEIGN_HRL:localhost:8060}
   JoinFeign:
     url: ${JOINFEIGN_URL:172.16.33.162:8006}
   OTMSFeign:
@@ -59,7 +59,8 @@ openfeign:
 piction:
   #path: C:\Users\24390\Desktop\work\a
   #path: D:\Code\work\jpg
-  path: /shared
+#  path: /shared
+ path: C:\Users\zx\Pictures\test
 
 server:
   port: 8080

src/main/resources/application-prod.yml

@@ -42,6 +42,7 @@ piction:
   # path: /usr/share/nginx/html/image
   #  path: /test/data/nginx/html/image
   # path: C:\Users\24390\Desktop\work\a
-  path: /shared
+#  path: /shared
+  path: C:\Users\zx\Pictures\test
 server:
   port: 8080

src/main/resources/bootstrap.yml

@@ -1,7 +1,7 @@
 api.version: api/v1
 spring:
   profiles:
-    include: ${SPRING_PROFILES:dev}
+    include: ${SPRING_PROFILES:prod}
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8

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

@@ -1224,16 +1224,18 @@
             and (INSTR(db.RESULT_FOREIGN_SHIP_NAME,#{index}) > 0 or INSTR(rm.MATERIAL_NAME,#{index}) > 0)
         </if>
     </select>
+    <!-- 获取发站-->
     <select id="getInwardSendStation" resultType="java.util.Map">
         select
             RAS.ARRIVAL_NAME "sendStation",
             RAS.ARRIVAL_ID		"sendStationId"
             from RMSTRAIN_ARRIVAL_SEND RAS
             WHERE RAS.ARRIVAL_TYPE_ID = 1
+
     </select>
-    <select id="getInwardInboundResult" resultType="java.util.Map" parameterType="java.util.LinkedHashMap">
-        SELECT DISTINCT
-               RC.CAPACITY_NUMBER "capacityNumber",
+
+    <select id="getInwardInboundResult" resultType="java.util.Map" parameterType="java.util.Map">
+        SELECT RC.CAPACITY_NUMBER "capacityNumber",
                OO.ORDER_NUMBER "orderNumber",
                OO.ORDER_ID "orderId",
                RPG.INSERT_TIME "insertTime",