Redeem před 1 rokem
rodič
revize
e81b4a0511

+ 1 - 1
pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.example</groupId>
     <artifactId>dil-wms-api</artifactId>
-    <version>1.4</version>
+    <version>1.5</version>
 
     <parent>
         <groupId>org.springframework.boot</groupId>

+ 31 - 0
src/main/resources/com/steerinfo/dil/mapper/OyeRealtimeInventoryMapper.xml

@@ -832,6 +832,26 @@
            )
     </select>
   <select id="receiveSendReport" resultType="java.util.Map">
+    SELECT
+    TT."inboundWarehouse",
+    TT."materialModel",
+    TT."materialSpe",
+    TT."materialName",
+    TT."companyName",
+    TT."saleArea",
+    TT."meter",
+    TT."singleWeight",
+    SUM(TT."inboundMaterialNumber") "inboundMaterialNumber",
+    SUM(TT."inboundMaterialWeight") "inboundMaterialWeight",
+    SUM(TT."outboundMaterialNumber") "outboundMaterialNumber",
+    SUM(TT."outboundMaterialWeight") "outboundMaterialWeight",
+    SUM(TT."currentInboundMaterialNumber") "currentInboundMaterialNumber",
+    SUM(TT."currentInboundTheoryWeight") "currentInboundTheoryWeight",
+    SUM(TT."currentOutboundMaterialNumber") "currentOutboundMaterialNumber",
+    SUM(TT."currentOutboundTheoryWeight") "currentOutboundTheoryWeight",
+    SUM(TT."materialNumber") "materialNumber",
+    SUM(TT."materialWeight") "materialWeight"
+    FROM (
     SELECT
     NVL(T1."inboundMaterialNumber",0) "inboundMaterialNumber",
     NVL(T1."inboundMaterialWeight",0) "inboundMaterialWeight",
@@ -839,6 +859,8 @@
     NVL(T2."outboundMaterialWeight",0) "outboundMaterialWeight",
     ORI.INVENTORY_ID,
     ORI.SALE_AREA "saleArea",
+    ORI.METER   "meter",
+    ORI.SINGLE_WEIGHT   "singleWeight",
     RC.CONSIGNEE_COMPANY_NAME "companyName",
     RM.MATERIAL_NAME "materialName",
     RM.MATERIAL_SPECIFICATION "materialSpe",
@@ -943,6 +965,15 @@
         </foreach>
       </if>
     </where>
+    ) TT
+    GROUP BY TT."inboundWarehouse",
+             TT."materialModel",
+             TT."materialSpe",
+             TT."materialName",
+             TT."companyName",
+             TT."saleArea",
+             TT."meter",
+             TT."singleWeight"
   </select>
   <select id="getSaleAreaRemark" resultType="java.lang.String">
     SELECT RSR.SALE_REMARK FROM RMS_SALER_REMAR RSR

+ 1 - 1
src/main/resources/log4j.properties

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