1

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/WarehousingOrderController.java

@@ -76,6 +76,15 @@ public class WarehousingOrderController {
     public String dryOut(@RequestBody WarehousingOrder warehousingOrder) {
         return warehousingOrderService.dryOut(warehousingOrder);
     }
+    /**
+     * 计算折干后重量
+     * @param warehousingOrder
+     * @return
+     */
+    @PostMapping("/dryWeight")
+    public Double dryWeight(@RequestBody WarehousingOrder warehousingOrder) {
+        return warehousingOrderService.dryWeight(warehousingOrder);
+    }
     /**
      * 付款
      * @param warehousingOrder

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/IWarehousingOrderService.java

@@ -77,6 +77,12 @@ public interface IWarehousingOrderService extends IService<WarehousingOrder> {
      * @param warehousingOrder
      */
     String dryOut(WarehousingOrder warehousingOrder);
+    /**
+     * 计算折干后重量
+     * @param
+     * @return
+     */
+    Double dryWeight(WarehousingOrder warehousingOrder);
 
     /**
      * 入库单导出

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WarehousingOrderServiceImpl.java

@@ -2695,6 +2695,30 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
 //            warehousePositionStorageInfoService.updateById(warehousePositionStorageInfo);
     }
 
+    @Override
+    public Double dryWeight(WarehousingOrder warehousingOrder) {
+        Double dryWeight=0d;
+        if (!CollectionUtils.isEmpty(warehousingOrder.getWarehousingOrderList())) {
+            for (WarehousingOrder warehousingOrder1:warehousingOrder.getWarehousingOrderList()){
+                if ("采购入库".equals(warehousingOrder1.getInType())){
+                    List<WarehouseInOutInfo> warehouseInOutInfoList=warehouseInOutInfoService.selectList(new EntityWrapper<WarehouseInOutInfo>()
+                    .eq("order_id",warehousingOrder1.getId()));
+                    if (!CollectionUtils.isEmpty(warehouseInOutInfoList)){
+                        dryWeight =dryWeight+ (warehouseInOutInfoList.stream().mapToDouble(WarehouseInOutInfo::getPureWeight).sum());
+                    }
+                }
+                else if ("收购入库".equals(warehousingOrder1.getInType())){
+                    List<PaymentManagement> paymentManagementList=paymentManagementService.selectList(new EntityWrapper<PaymentManagement>()
+                            .eq("order_id",warehousingOrder1.getId()));
+                    if (!CollectionUtils.isEmpty(paymentManagementList)){
+                        dryWeight =dryWeight+((paymentManagementList.stream().mapToDouble(PaymentManagement::getPureWeight).sum())/ 1000) ;
+                    }
+                }
+            }
+        }
+        return dryWeight;
+    }
+
     private List<String> getResourceIdList() {
         User currentUser = AuthSecurityUtils.getCurrentUserInfo();
         // 当前登录人主要角色