杰生

hx-service-api/storage-api/src/main/java/com/fjhx/params/stock/StatisticsResult.java

@@ -9,6 +9,11 @@ import java.math.BigDecimal;
 public class StatisticsResult {
 
     /**
+     * 工艺
+     */
+    private String tech;
+
+    /**
      * 排班面积
      */
     private BigDecimal scheduleArea;
@@ -93,6 +98,11 @@ public class StatisticsResult {
     private BigDecimal transferOutArea;
 
     /**
+     * 布头布尾面料
+     */
+    private BigDecimal headTailCorrectArea;
+
+    /**
      * 用户id
      */
     private String userId;
@@ -130,6 +140,7 @@ public class StatisticsResult {
                 .subtract(getBackArea())
                 .subtract(getCorrectArea())
                 .subtract(getTransferOutArea())
+                .subtract(getHeadTailCorrectArea())
                 .add(getTransferInArea());
     }
 
@@ -187,4 +198,8 @@ public class StatisticsResult {
     public BigDecimal getTransferOutArea() {
         return BigDecimalUtil.keepDecimals(transferOutArea);
     }
+
+    public BigDecimal getHeadTailCorrectArea() {
+        return BigDecimalUtil.keepDecimals(headTailCorrectArea);
+    }
 }

hx-service/storage/src/main/java/com/fjhx/stock/controller/StockBackController.java

@@ -239,5 +239,18 @@ public class StockBackController {
         return R.success();
     }
 
+
+    // /**
+    //  * 领料
+    //  */
+    // @PostMapping("/picking")
+    // public R picking(@RequestBody Condition condition) {
+    //
+    //     List<Map<String, Object>> result = stockBackDetailsService.picking(condition);
+    //
+    //     return R.success(result);
+    // }
+
+
 }
 

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

@@ -175,6 +175,7 @@
         uu.JobNo jobNo,
         uu.RealName userName,
         sbpd.plan_material materialName,
+        sbpd.tech tech,
         sum(sbpd.quantity) scheduleArea,
         sum(sbpd.correct_area) correctArea,
         sum(sbpd.picking_money) pickingMoney,
@@ -186,7 +187,8 @@
         sum(sbpd.back_meters) backMeters,
         sum(sbpd.back_area) backArea,
         sum(sbpd.transfer_in_area) transferInArea,
-        sum(sbpd.transfer_out_area) transferOutArea
+        sum(sbpd.transfer_out_area) transferOutArea,
+        sum(sbpd.head_tail_correct_area) headTailCorrectArea
         from stock_back_plan_details sbpd
         left join u_user uu on uu.JobNo = sbpd.job_no
         where

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

@@ -1,9 +1,9 @@
 package com.fjhx.stock.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.base.BaseService;
 import com.fjhx.entity.stock.StockBackDetails;
 import com.fjhx.params.stock.StockBackDetailsVo;
-import com.fjhx.base.BaseService;
 
 import java.util.Map;
 
@@ -25,4 +25,6 @@ public interface StockBackDetailsService extends BaseService<StockBackDetails> {
 
     void delete(StockBackDetailsVo stockBackDetailsVo);
 
+    // List<Map<String, Object>> picking(Condition condition);
+
 }

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

@@ -3,12 +3,12 @@ package com.fjhx.stock.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.utils.WrapperUtil;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.entity.stock.StockBackDetails;
 import com.fjhx.params.stock.StockBackDetailsVo;
 import com.fjhx.stock.mapper.StockBackDetailsMapper;
 import com.fjhx.stock.service.StockBackDetailsService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.utils.WrapperUtil;
 import org.springframework.stereotype.Service;
 
 import java.util.Map;
@@ -51,4 +51,20 @@ public class StockBackDetailsServiceImpl extends ServiceImpl<StockBackDetailsMap
         removeById(stockBackDetailsVo.getId());
     }
 
+    // @Override
+    // public List<Map<String, Object>> picking(Condition condition) {
+    //
+    //     // 人员
+    //     String userId = condition.getStr("userId");
+    //     // 开始时间
+    //     Date beginTime = condition.getBeginTime();
+    //     // 结束时间
+    //     Date endTime = condition.getEndTime();
+    //     // 物料名称
+    //     String materialName = condition.getStr("materialName");
+    //
+    //
+    //     return null;
+    // }
+
 }

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

@@ -408,8 +408,9 @@ public class StockBackServiceImpl extends ServiceImpl<StockBackMapper, StockBack
             result.setBackNum(result.getBackNum() + item.getBackNum());
             result.setBackMeters(result.getBackMeters().add(item.getBackMeters()));
             result.setBackArea(result.getBackArea().add(item.getBackArea()));
-            result.setTransferInArea(result.getTransferInArea().add(item.getTransferInArea() == null ? BigDecimal.ZERO : item.getTransferInArea()));
-            result.setTransferOutArea(result.getTransferOutArea().add(item.getTransferOutArea() == null ? BigDecimal.ZERO : item.getTransferOutArea()));
+            result.setTransferInArea(result.getTransferInArea().add(ObjectUtil.defaultIfNull(item.getTransferInArea(), BigDecimal.ZERO)));
+            result.setTransferOutArea(result.getTransferOutArea().add(ObjectUtil.defaultIfNull(item.getTransferOutArea(), BigDecimal.ZERO)));
+            result.setHeadTailCorrectArea(result.getHeadTailCorrectArea().add(ObjectUtil.defaultIfNull(item.getHeadTailCorrectArea(), BigDecimal.ZERO)));
         }
 
         return result;