Skip to content

M
maintain_service
Commit c011c15c authored by 刘帅's avatar 刘帅
Browse files
Options

1.打印单

parent c76818ee
Hide whitespace changes
Inline Side-by-side
Showing with 74 additions and 41 deletions
maintain-business/src/main/java/com/maintain/business/service/impl/ErpMaterialCheckServiceImpl.java
View file @ c011c15c
......@@ -58,6 +58,7 @@ public class ErpMaterialCheckServiceImpl implements IErpMaterialCheckService {
private final ErpMaterialPickingMapper materialPickingMapper;
private final ErpMaterialPickingInfoMapper materialPickingInfoMapper;
private final ErpMaterialInventoryRecordMapper materialInventoryRecordMapper;
/**
* 查询物资盘点
*/
......@@ -102,6 +103,7 @@ public class ErpMaterialCheckServiceImpl implements IErpMaterialCheckService {
}
private LambdaQueryWrapper<ErpMaterialCheck> buildQueryWrapper(ErpMaterialCheckBo bo) {
List<SysDept> sysDeptList = deptMapper.selectChildrenDeptById(LoginHelper.getDeptId(), null);
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<ErpMaterialCheck> lqw = Wrappers.lambdaQuery();
lqw.like(StringUtils.isNotBlank(bo.getTaskCode()), ErpMaterialCheck::getTaskCode, bo.getTaskCode());
......@@ -117,6 +119,7 @@ public class ErpMaterialCheckServiceImpl implements IErpMaterialCheckService {
lqw.eq(bo.getDeptId() != null, ErpMaterialCheck::getDeptId, bo.getDeptId());
lqw.like(StringUtils.isNotBlank(bo.getDeptName()), ErpMaterialCheck::getDeptName, bo.getDeptName());
lqw.eq(bo.getCreateDeptId() != null, ErpMaterialCheck::getCreateDeptId, bo.getCreateDeptId());
lqw.in(!sysDeptList.isEmpty(), ErpMaterialCheck::getDeptId, sysDeptList.stream().map(SysDept::getDeptId).collect(Collectors.toList()));
lqw.orderByDesc(ErpMaterialCheck::getCreateTime);
return lqw;
}
......
maintain-business/src/main/java/com/maintain/business/service/impl/ErpMaterialPickingServiceImpl.java
View file @ c011c15c
......@@ -9,6 +9,7 @@ import com.maintain.business.domain.vo.*;
import com.maintain.business.mapper.*;
import com.maintain.business.service.IErpMaterialService;
import com.maintain.common.core.domain.BaseEntity;
import com.maintain.common.core.domain.entity.SysDept;
import com.maintain.common.enums.InventoryType;
import com.maintain.common.enums.IsEnableStatus;
import com.maintain.common.enums.PickingState;
......@@ -21,6 +22,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.maintain.common.utils.redis.RedisUtils;
import com.maintain.system.mapper.SysDeptMapper;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import com.maintain.business.domain.bo.ErpMaterialPickingBo;
......@@ -50,6 +52,7 @@ public class ErpMaterialPickingServiceImpl implements IErpMaterialPickingService
private final ErpMaterialMapper materialMapper;
private final ErpMaterialInventoryRecordMapper materialInventoryRecordMapper;
private final ErpWarehouseMapper warehouseMapper;
private final SysDeptMapper deptMapper;
/**
* 查询报修单-领料出库单
......@@ -113,6 +116,7 @@ public class ErpMaterialPickingServiceImpl implements IErpMaterialPickingService
}
private LambdaQueryWrapper<ErpMaterialPicking> buildQueryWrapper(ErpMaterialPickingBo bo) {
List<SysDept> sysDeptList = deptMapper.selectChildrenDeptById(LoginHelper.getDeptId(), null);
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<ErpMaterialPicking> lqw = Wrappers.lambdaQuery();
lqw.eq( bo.getType() != null, ErpMaterialPicking::getType, bo.getType());
......@@ -129,6 +133,7 @@ public class ErpMaterialPickingServiceImpl implements IErpMaterialPickingService
lqw.eq(bo.getReceiveTime() != null, ErpMaterialPicking::getReceiveTime, bo.getReceiveTime());
lqw.eq(bo.getState() != null, ErpMaterialPicking::getState, bo.getState());
lqw.in(bo.getStateList() != null, ErpMaterialPicking::getState, bo.getStateList());
lqw.in(!sysDeptList.isEmpty(), ErpMaterialPicking::getCreateDeptId, sysDeptList.stream().map(SysDept::getDeptId).collect(Collectors.toList()));
lqw.orderByDesc(BaseEntity::getCreateTime);
return lqw;
}
......
maintain-business/src/main/java/com/maintain/business/service/impl/ErpMaterialPutawayServiceImpl.java
View file @ c011c15c
......@@ -15,12 +15,14 @@ import com.maintain.business.service.IErpMaterialPutawayService;
import com.maintain.business.service.IErpMaterialService;
import com.maintain.common.core.domain.BaseEntity;
import com.maintain.common.core.domain.PageQuery;
import com.maintain.common.core.domain.entity.SysDept;
import com.maintain.common.core.page.TableDataInfo;
import com.maintain.common.enums.InventoryType;
import com.maintain.common.enums.PickingState;
import com.maintain.common.helper.LoginHelper;
import com.maintain.common.utils.StringUtils;
import com.maintain.common.utils.redis.RedisUtils;
import com.maintain.system.mapper.SysDeptMapper;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
......@@ -47,6 +49,7 @@ public class ErpMaterialPutawayServiceImpl implements IErpMaterialPutawayService
private final ErpMaterialMapper materialMapper;
private final IErpMaterialService materialService;
private final ErpMaterialInventoryRecordMapper materialInventoryRecordMapper;
private final SysDeptMapper deptMapper;
/**
* 查询物料入库
......@@ -80,6 +83,7 @@ public class ErpMaterialPutawayServiceImpl implements IErpMaterialPutawayService
}
private LambdaQueryWrapper<ErpMaterialPutaway> buildQueryWrapper(ErpMaterialPutawayBo bo) {
List<SysDept> sysDeptList = deptMapper.selectChildrenDeptById(LoginHelper.getDeptId(), null);
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<ErpMaterialPutaway> lqw = Wrappers.lambdaQuery();
lqw.like(StringUtils.isNotBlank(bo.getOrderNumber()), ErpMaterialPutaway::getOrderNumber, bo.getOrderNumber());
......@@ -94,6 +98,7 @@ public class ErpMaterialPutawayServiceImpl implements IErpMaterialPutawayService
lqw.like(StringUtils.isNotBlank(bo.getVendorName()), ErpMaterialPutaway::getVendorName, bo.getVendorName());
lqw.eq(bo.getCreateDeptId() != null, ErpMaterialPutaway::getCreateDeptId, bo.getCreateDeptId());
lqw.eq(bo.getState() != null, ErpMaterialPutaway::getState, bo.getState());
lqw.in(!sysDeptList.isEmpty(), ErpMaterialPutaway::getCreateDeptId, sysDeptList.stream().map(SysDept::getDeptId).collect(Collectors.toList()));
lqw.orderByDesc(BaseEntity::getCreateTime);
return lqw;
}
......
maintain-business/src/main/java/com/maintain/business/service/impl/ErpMaterialReturnsServiceImpl.java
View file @ c011c15c
......@@ -13,6 +13,7 @@ import com.maintain.business.domain.vo.ErpWarehouseVo;
import com.maintain.business.mapper.*;
import com.maintain.business.service.IErpMaterialService;
import com.maintain.common.core.domain.BaseEntity;
import com.maintain.common.core.domain.entity.SysDept;
import com.maintain.common.enums.InventoryType;
import com.maintain.common.enums.IsEnableStatus;
import com.maintain.common.helper.LoginHelper;
......@@ -23,6 +24,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.maintain.common.utils.redis.RedisUtils;
import com.maintain.system.mapper.SysDeptMapper;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import com.maintain.business.domain.bo.ErpMaterialReturnsBo;
......@@ -53,6 +55,7 @@ public class ErpMaterialReturnsServiceImpl implements IErpMaterialReturnsService
private final IErpMaterialService materialService;
private final ErpMaterialInventoryRecordMapper erpMaterialInventoryRecordMapper;
private final ErpWarehouseMapper warehouseMapper;
private final SysDeptMapper deptMapper;
/**
* 查询物料退货
......@@ -87,6 +90,7 @@ public class ErpMaterialReturnsServiceImpl implements IErpMaterialReturnsService
}
private LambdaQueryWrapper<ErpMaterialReturns> buildQueryWrapper(ErpMaterialReturnsBo bo) {
List<SysDept> sysDeptList = deptMapper.selectChildrenDeptById(LoginHelper.getDeptId(), null);
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<ErpMaterialReturns> lqw = Wrappers.lambdaQuery();
lqw.eq(bo.getReturnsMoney() != null, ErpMaterialReturns::getReturnsMoney, bo.getReturnsMoney());
......@@ -104,6 +108,7 @@ public class ErpMaterialReturnsServiceImpl implements IErpMaterialReturnsService
lqw.eq(bo.getVendorId() != null, ErpMaterialReturns::getVendorId, bo.getVendorId());
lqw.like(StringUtils.isNotBlank(bo.getVendorName()), ErpMaterialReturns::getVendorName, bo.getVendorName());
lqw.eq(bo.getCreateDeptId() != null, ErpMaterialReturns::getCreateDeptId, bo.getCreateDeptId());
lqw.in(!sysDeptList.isEmpty(), ErpMaterialReturns::getCreateDeptId, sysDeptList.stream().map(SysDept::getDeptId).collect(Collectors.toList()));
lqw.orderByDesc(BaseEntity::getCreateTime);
return lqw;
}
......
maintain-business/src/main/resources/mapper/ErpRepairFormMapper.xml
View file @ c011c15c
......@@ -165,19 +165,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN erp_vehicle_model evm on erf.vehicle_model_id = evm.id
LEFT JOIN erp_client ec2 on erf.client_id = ec2.id
LEFT JOIN (
SELECT
repair_form_id,
SUM(actual_time) AS totalActualTime,
SUM(actual_time * standard_price) AS totalActualTimeMoney
FROM erp_repair_form_project
GROUP BY repair_form_id) erfpd ON erf.id = erfpd.repair_form_id
SELECT repair_form_id, SUM(actual_time) AS totalActualTime, SUM(actual_time * standard_price) AS totalActualTimeMoney
FROM erp_repair_form_project
GROUP BY repair_form_id
) erfpd ON erf.id = erfpd.repair_form_id
LEFT JOIN (
SELECT
repair_form_id,
SUM(selling_price * collect_number) AS totalMaterialMoney
FROM erp_material_picking_info
GROUP BY repair_form_id
) empi ON erf.id = empi.repair_form_id
SELECT repair_form_id, SUM(selling_price * collect_number) AS totalMaterialMoney
FROM erp_material_picking_info
GROUP BY repair_form_id
) empi ON erf.id = empi.repair_form_id
</sql>
<select id="customQueryPageList" resultMap="ErpRepairFormResultVo">
<include refid="repairFormResultVoSql" />
......
maintain-ui/src/views/business/malfunctionProject/index.vue
View file @ c011c15c
......@@ -120,24 +120,24 @@
<el-table-column label="故障名称" align="center" prop="malfunctionName" />
<el-table-column label="创建人" align="center" prop="createBy" />
<el-table-column label="创建时间" align="center" prop="createTime" width="180" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['business:malfunctionProject:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['business:malfunctionProject:remove']"
>删除</el-button>
</template>
</el-table-column>
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-edit"-->
<!-- @click="handleUpdate(scope.row)"-->
<!-- v-hasPermi="['business:malfunctionProject:edit']"-->
<!-- >修改</el-button>-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-delete"-->
<!-- @click="handleDelete(scope.row)"-->
<!-- v-hasPermi="['business:malfunctionProject:remove']"-->
<!-- >删除</el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table>
<pagination
......
maintain-ui/src/views/business/repairForm/info.vue
View file @ c011c15c
......@@ -4,13 +4,13 @@
<el-form :model="form" ref="form" :rules="rules" size="small" label-width="110px" >
<div style="display: flex; justify-content: space-between; align-items: center; margin-bottom: 16px;">
<span style="font-weight: bold; font-size: 18px;">客户车辆信息</span>
<el-dropdown trigger="click">
<el-dropdown trigger="click" @command="menuClick">
<el-button type="primary">单据预览<i class="el-icon-arrow-down el-icon--right"></i></el-button>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item @click="handleClick">接车单</el-dropdown-item>
<el-dropdown-item @click="handleClick">报价单</el-dropdown-item>
<el-dropdown-item @click="handleClick">客户结算单</el-dropdown-item>
<el-dropdown-item @click="handleClick">保险阶段单</el-dropdown-item>
<el-dropdown-menu slot="dropdown" >
<el-dropdown-item command="1" v-hasPermi="['business:repairForm:receiptOrder']">接车单</el-dropdown-item>
<el-dropdown-item command="2" v-hasPermi="['business:repairForm:quoteOrder']">报价单</el-dropdown-item>
<el-dropdown-item command="3" v-hasPermi="['business:repairForm:settleOrder']">客户结算单</el-dropdown-item>
<el-dropdown-item command="4" v-hasPermi="['business:repairForm:insuranceOrder']">保险阶段单</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div>
......@@ -726,6 +726,23 @@ export default {
}
})
},
/** 单据预览 */
menuClick(command) {
switch (command) {
case '1':
window.open(`http://${window.location.hostname}:8099/jmreport/view/1110353404338548736?id=${this.form.id}`, '_blank');
break;
case '2':
window.open(`http://${window.location.hostname}:8099/jmreport/view/1110433225777262592?id=${this.form.id}`, '_blank');
break;
case '3':
window.open(`http://${window.location.hostname}:8099/jmreport/view/1110458589836652544?id=${this.form.id}`, '_blank');
break;
case '4':
break;
}
},
/** 查询人员-人员列表 */
getMaintainUserList() {
listUser({ type: 1, pageNum: 1, pageSize: 100 }).then(response => {
......@@ -762,7 +779,13 @@ export default {
this.getReason();
},
getReason(){
listMaintainCause({ pageSize: 99, pageNum: 1, type: this.form.repairType}).then(res=>{
let type = null
if (this.form.repairType === '3') {
type = undefined
}else {
type = this.form.repairType
}
listMaintainCause({ pageSize: 99, pageNum: 1, type}).then(res=>{
this.reasonList = res.rows
})
},
......@@ -929,10 +952,6 @@ export default {
}
});
},
handleClick() {
this.$alert('暂未开放，功能开发中。。。')
// alert('暂未开放，功能开发中。。。');
}
}
};
</script>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment