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