Browse Source

出库加短溢装

zhangyuewww 2 years ago
parent
commit
8a6d3e8b4e

+ 9 - 1
winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WarehouseInOutInfoServiceImpl.java

@@ -2516,6 +2516,10 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                     //入库
                     if (contractManagementInfo != null && "2".equals(inOutWarehouseTask.getInOutFlag())) {
                         overNeight = inOutWarehouseTask.getWeight() * (contractManagementInfo.getOverShort() / 100);
+                    }
+                    //出库
+                    else if ("1".equals(inOutWarehouseTask.getInOutFlag())) {
+                        overNeight = inOutWarehouseTask.getWeight() * 0.05f;
                     } else {
                         contractManagementInfo = contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
                                 .eq("comp_id", inOutWarehouseTask.getCompId())
@@ -2555,7 +2559,11 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                     //入库
                     if (contractManagementInfo != null && "2".equals(inOutWarehouseTask.getInOutFlag())) {
                         overNeight = inOutWarehouseTask.getWeight() * (contractManagementInfo.getOverShort() / 100);
-                    } else {
+                    }
+                    //出库
+                    else if ("1".equals(inOutWarehouseTask.getInOutFlag())) {
+                        overNeight = inOutWarehouseTask.getWeight() * 0.05f;
+                    }else {
                         contractManagementInfo = contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
                                 .eq("comp_id", inOutWarehouseTask.getCompId())
                                 .eq("contract_no", inOutWarehouseTask.getWarehouseName()));