1

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

@@ -2758,6 +2758,9 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
                     if (!CollectionUtils.isEmpty(warehouseInOutInfoList)){
                         dryWeight =dryWeight+ (warehouseInOutInfoList.stream().mapToDouble(WarehouseInOutInfo::getPureWeight).sum());
                     }
+                    if (warehousingOrder1.getSurplusWeight()<warehousingOrder1.getInWarehouseWeight()){
+                        dryWeight=warehousingOrder1.getSurplusWeight()/warehousingOrder1.getInWarehouseWeight()*dryWeight;
+                    }
                 }
                 else if ("收购入库".equals(warehousingOrder1.getInType())){
                     List<PaymentManagement> paymentManagementList=paymentManagementService.selectList(new EntityWrapper<PaymentManagement>()
@@ -2789,6 +2792,9 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
 //                            }
                         }
                     }
+                    if (warehousingOrder1.getSurplusWeight()<warehousingOrder1.getInWarehouseWeight()){
+                        dryWeight=warehousingOrder1.getSurplusWeight()/warehousingOrder1.getInWarehouseWeight()*dryWeight;
+                    }
                 }
             }
         }