领料界面 指定领料追踪

hx-common/common-tool/src/main/java/com/fjhx/utils/BigDecimalUtil.java

@@ -123,6 +123,20 @@ public class BigDecimalUtil {
     }
 
     /**
+     * 除法运算
+     */
+    public BigDecimalUtil divideTry(Object value, int scale) {
+        BigDecimal bigDecimal = objToBigDecimal(value);
+        if (bigDecimal.compareTo(BigDecimal.ZERO) == 0) {
+            return this;
+        }
+
+        this.bigDecimal = this.bigDecimal.divide(bigDecimal, scale, RoundingMode.HALF_UP);
+        return this;
+    }
+
+
+    /**
      * 获取计算结果值
      */
     public BigDecimal getValue() {

hx-service-api/storage-api/src/main/java/com/fjhx/entity/scheduling/SchedulingActual.java

@@ -2,6 +2,7 @@ package com.fjhx.entity.scheduling;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -16,6 +17,7 @@ import java.util.Date;
  * @author ${author}
  * @since 2022-08-09
  */
+@TableName("stock_scheduling_actual")
 @Data
 public class SchedulingActual implements Serializable {
 

hx-service/storage/src/main/java/com/fjhx/stock/mapper/StockDetailMapper.java

@@ -44,6 +44,7 @@ public interface StockDetailMapper extends BaseMapper<StockDetail> {
 
     Map<String, Object> selectAdditionalMeterAndArea(@Param("ew") QueryWrapper<Object> wrapper);
 
+    @InterceptorIgnore(tenantLine = "1")
     List<Map<String, Object>> selectClaimed(@Param("ew") QueryWrapper<Object> wrapper);
 
 }

hx-service/storage/src/main/java/com/fjhx/stock/service/impl/StockDetailServiceImpl.java

@@ -381,10 +381,10 @@ public class StockDetailServiceImpl extends ServiceImpl<StockDetailMapper, Stock
      */
     private void setRatio(PickingTrackingNumStatisticsResult result) {
         // 指定产出比
-        result.setAppointOutputRatio(BigDecimalUtil.init(result.getAppointArea()).divide(result.getPlanArea(), 4).getValue());
+        result.setAppointOutputRatio(BigDecimalUtil.init(result.getAppointArea()).divideTry(result.getPlanArea(), 4).getValue());
 
         // 实际产出比
-        result.setActualOutputRatio(BigDecimalUtil.init(result.getActualArea()).divide(result.getPlanArea(), 4).getValue());
+        result.setActualOutputRatio(BigDecimalUtil.init(result.getActualArea()).divideTry(result.getPlanArea(), 4).getValue());
 
         // 产出比差额
         result.setOutputRatioDifference(result.getAppointOutputRatio().subtract(result.getActualOutputRatio()));