修改

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.example</groupId>
     <artifactId>dil-dazhou-api</artifactId>
-    <version>1.6</version>
+    <version>1.7</version>
 
     <parent>
         <groupId>org.springframework.boot</groupId>

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

@@ -1181,5 +1181,17 @@ public class WMSController extends BaseRESTfulController {
     public  Map<String,Object> insertOyeInboundResult(@RequestBody Map<String,Object> map) {
         return wmsFeign.insertOyeInboundResult(map);
     }
+
+    @ApiOperation("划分实时库存")
+    @PostMapping("updateInsertRealTime")
+    public Map<String,Object> updateInsertRealTime(@RequestBody Map<String,Object> map) {
+        return wmsFeign.updateInsertRealTime(map);
+    }
+
+    @ApiOperation("定制报表数据,收发存")
+    @PostMapping("receiveSendReport")
+    public Map<String,Object> receiveSendReport(@RequestBody Map<String,Object> map) {
+        return wmsFeign.receiveSendReport(map);
+    }
 }
 

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

@@ -981,4 +981,10 @@ public interface WMSFeign {
     @PostMapping("/api/v1/wms/OyeResult/insertOyeOutboundResult")
     Map<String, Object> insertOyeOutboundResult(@RequestBody Map<String, Object> map);
 
+    @PostMapping("/api/v1/wms/OyeResult/updateInsertRealTime")
+    Map<String, Object> updateInsertRealTime(@RequestBody Map<String, Object> map);
+
+    @PostMapping("/api/v1/wms/OyeResult/receiveSendReport")
+    Map<String, Object> receiveSendReport(@RequestBody Map<String, Object> map);
+
 }

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

@@ -1699,7 +1699,8 @@
         SELECT DISTINCT
                RC.CONSIGNEE_ID "value",
                RC.CONSIGNEE_ID "id",
-               RC.CONSIGNEE_COMPANY_NAME "label"
+               RC.CONSIGNEE_COMPANY_NAME "label",
+               RC.CONSIGNEE_SSO_ID "consigneeSsoId"
                FROM OYE_REALTIME_INVENTORY ORI
         LEFT JOIN RMS_CONSIGNEE RC on ORI.CONSIGNEE_ID = RC.CONSIGNEE_ID
         WHERE ORI.CONSIGNEE_ID is not NULL
@@ -1707,6 +1708,12 @@
         <if test="saleArea != null and saleArea != ''">
             AND ORI.SALE_AREA = #{saleArea}
         </if>
+        <if test="consigneeSsoId != null and consigneeSsoId != ''">
+            AND RC.CONSIGNEE_SSO_ID = #{consigneeSsoId}
+        </if>
+        <if test="consigneeName != null and consigneeName != ''">
+            AND RC.CONSIGNEE_COMPANY_NAME = #{consigneeName}
+        </if>
     </select>
     <select id="getOyeSaleArea" resultType="java.util.Map">
         SELECT DISTINCT

src/main/resources/log4j.properties

@@ -1,5 +1,5 @@
 ## LOG4J配置
-log4j.rootCategory=INFO,file, RUNNING,errorfile
+log4j.rootCategory=INFO,file, RUNNING,errorfile,stdout
 ## 控制台输出
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout