Merge remote-tracking branch 'origin/master'

highway
wws 1 year ago
commit 04de6bbefa

@ -172,11 +172,22 @@ public class ProProcessController extends BaseController {
/**
*
*/
@RequiresPermissions("wms:factory:getWorkCenterList")
@RequiresPermissions("mes:pro:process:getWorkCenterList")
@GetMapping("/getWorkCenterList")
public TableDataInfo getWorkCenterList(SysFactory sysFactory) {
startPage();
List<SysFactory> list = proProcessService.getWorkCenterList(sysFactory);
return getDataTable(list);
}
/**
*
*/
@RequiresPermissions("mes:pro:process:getEquipmentTypeList")
@GetMapping("/getEquipmentTypeList")
public TableDataInfo getEquipmentTypeList(Equipment equipment) {
startPage();
List<Equipment> list = proProcessService.getEquipmentTypeList(equipment);
return getDataTable(list);
}
}

@ -76,4 +76,7 @@ public interface ProProcessMapper
//查询下拉式工作中心
public List<SysFactory> getWorkCenterList(SysFactory sysFactory);
//查询设备类型
List<Equipment> getEquipmentTypeList(Equipment equipment);
}

@ -77,4 +77,7 @@ public interface IProProcessService
//查询下拉式工作中心
List<SysFactory> getWorkCenterList(SysFactory sysFactory);
//查询设备类型
List<Equipment> getEquipmentTypeList(Equipment equipment);
}

@ -245,4 +245,16 @@ public class ProProcessServiceImpl implements IProProcessService {
public List<SysFactory> getWorkCenterList(SysFactory sysFactory) {
return proProcessMapper.getWorkCenterList(sysFactory);
}
/**
*
*
* @param equipment
* @return
*/
@Override
@DS("#header.poolName")
public List<Equipment> getEquipmentTypeList(Equipment equipment) {
return proProcessMapper.getEquipmentTypeList(equipment);
}
}

@ -297,9 +297,9 @@
<select id="selectEquipmentList" parameterType="Equipment" resultMap="EquipmentResult">
<include refid="selectEquipmentVo"/>
<where>
<if test="equipmentCode != null and equipmentCode != ''"> and equipment_code = #{equipmentCode}</if>
<if test="equipmentCode != null and equipmentCode != ''"> and equipment_code like concat('%', #{equipmentCode}, '%')</if>
<if test="equipmentName != null and equipmentName != ''"> and equipment_name like concat('%', #{equipmentName}, '%')</if>
<if test="equipmentTypeCode != null and equipmentTypeCode != ''"> and equipment_type_code = #{equipmentTypeCode}</if>
<if test="equipmentTypeCode != null and equipmentTypeCode != ''"> and equipment_type_code like concat('%', #{equipmentTypeCode}, '%')</if>
<if test="equipmentTypeName != null and equipmentTypeName != ''"> and equipment_type_name like concat('%', #{equipmentTypeName}, '%')</if>
</where>
</select>
@ -323,4 +323,10 @@
from sys_factory
</select>
<select id="getEquipmentTypeList" parameterType="Equipment" resultMap="EquipmentResult">
select equipment_type_code,equipment_type_name
from base_equipment
group by equipment_type_code,equipment_type_name
</select>
</mapper>

@ -113,7 +113,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</foreach>
</delete>
<select id="getWorkCenterList" parameterType="SysFactory" resultType="SysFactoryResult">
<select id="getWorkCenterList" parameterType="SysFactory" resultMap="SysFactoryResult">
select factory_code,factory_name
from sys_factory
</select>

Loading…
Cancel
Save