Redeem 1 năm trước cách đây
mục cha
commit
6068a33fcb

+ 4 - 4
src/main/java/com/steerinfo/dil/service/impl/OyeResultServiceImpl.java

@@ -87,10 +87,10 @@ public class OyeResultServiceImpl implements IOyeResultService {
             if (oyeInboundResultMapper.selectSaleMaterialID(DataChange.dataToBigDecimal(map.get("saleMaterialId"))) != null) {
                 throw new Exception("该分录已入库,无法继续入库");
             }
-            ////判断该分录是否有净重
-            //if (DataChange.dataToBigDecimal(map.get("netWeight")) == null || DataChange.dataToBigDecimal(map.get("netWeight")).intValue() == 0) {
-            //    throw new Exception("该分录无净重,不允许入库");
-            //}
+            //判断该分录是否有净重
+            if (DataChange.dataToBigDecimal(map.get("netWeight")) == null || DataChange.dataToBigDecimal(map.get("netWeight")).intValue() == 0) {
+                throw new Exception("该分录无净重,不允许入库");
+            }
         }
         for (Map<String,Object> map : mapList) {
             insertInboundResultReal(map);

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

@@ -983,7 +983,10 @@
   </select>
   <select id="getTheoryWeight" resultType="java.math.BigDecimal" parameterType="java.math.BigDecimal">
     SELECT
-    ASM.MATERIAL_WEIGHT
+    CASE WHEN ASM.IS_POUND_SALE = 0
+    THEN TWB.BATCH_NET_WEIGHT
+    ELSE ASM.MATERIAL_WEIGHT
+    END
     FROM AMS_SALE_MATERIAL ASM
     LEFT JOIN TMSTRUCK_WEIGHT_BATCH TWB
     ON TWB.WEIGHT_BATCH_ID = ASM.WEIGHT_BATCH_ID

+ 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