Redeem 1 년 전
부모
커밋
8cf20acc21

+ 1 - 1
pom.xml

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

+ 2 - 1
src/main/resources/com/steerinfo/dil/mapper/OyeOutboundResultMapper.xml

@@ -825,7 +825,8 @@
     RM.MATERIAL_MODEL    "materialModel",
     OO.ORDER_ID          "orderId",
     OO.ORDER_NUMBER      "orderNumber",
-    OO.CAPACITY_ID       "capacityId"
+    OO.CAPACITY_ID       "capacityId",
+    OOR.SALE_MATERIAL_ID    "saleMaterialId"
     FROM OYE_OUTBOUND_RESULT OOR
     LEFT JOIN RMS_MATERIAL RM on OOR.MATERIAL_ID = RM.MATERIAL_ID
     LEFT JOIN RMS_CONSIGNEE RC on OOR.CONSIGNEE_ID = RC.CONSIGNEE_ID

+ 28 - 1
src/main/resources/com/steerinfo/dil/mapper/OyeRealtimeInventoryMapper.xml

@@ -674,6 +674,22 @@
   <!-- 友情提示!!!-->
   <!-- 请将自己写的代码放在此标签之下,方便以后粘贴复制。-->
   <select id="getOyeRealTimeResult" resultType="java.util.Map">
+    SELECT
+    TT."materialId" "materialId",
+    TT."meter" "meter",
+    TT."singleWeight" "singleWeight",
+    TT."consigneeName" "consigneeName",
+    TT."materialModel" "materialModel",
+    TT."materialSpe" "materialSpe",
+    TT."materialName" "materialName",
+    TT."consigneeId" "consigneeId",
+    TT."inboundArea" "inboundArea",
+    TT."inboundWarehouse" "inboundWarehouse",
+    TT."saleArea" "saleArea",
+    SUM(TT."materialNumber") "materialNumber",
+    SUM(TT."theoryWeight") "theoryWeight",
+    SUM(TT."netWeight") "netWeight"
+    FROM (
     SELECT ORI.SINGLE_WEIGHT "singleWeight",
     ORI.METER    "meter",
     ORI.MATERIAL_ID  "materialId",
@@ -739,7 +755,18 @@
         </foreach>
       </if>
     </where>
-    ORDER BY ORI.INSERT_TIME DESC
+    ORDER BY ORI.INSERT_TIME DESC) TT
+    GROUP BY TT."materialId",
+             TT."meter",
+             TT."singleWeight",
+             TT."consigneeName",
+             TT."materialModel",
+             TT."materialSpe",
+             TT."materialName",
+             TT."consigneeId",
+             TT."inboundArea",
+             TT."inboundWarehouse",
+             TT."saleArea"
   </select>
   <select id="getInventoryId" resultType="java.math.BigDecimal" parameterType="java.util.Map">
     SELECT ORI.INVENTORY_ID FROM OYE_REALTIME_INVENTORY ORI

+ 1 - 1
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