Merge remote-tracking branch 'origin/master'

1 year ago · 00a06d2898
parent e86bddaf1c bc10cc4713
commit 00a06d2898
1 changed files with 3 additions and 0 deletions
--- a/op-modules/op-technology/src/main/resources/mapper/technology/ProProcessMapper.xml
+++ b/op-modules/op-technology/src/main/resources/mapper/technology/ProProcessMapper.xml
@ -320,11 +320,14 @@
    <select id="getWorkCenterList" parameterType="SysFactory" resultMap="SysFactoryResult">
 		select  factory_code,factory_name
 		from sys_factory
+		where del_flag = '0'
+		and f_type = 'c'
 	</select>

    <select id="getEquipmentTypeList" parameterType="Equipment" resultMap="EquipmentResult">
 		select  equipment_type_code,equipment_type_name
 		from base_equipment
+		where del_flag = '0'
 		group by equipment_type_code,equipment_type_name
 	</select>