Merge remote-tracking branch 'origin/master'

op-modules/op-device/src/main/java/com/op/device/controller/DevicePDAController.java

@@ -160,10 +160,10 @@ public class DevicePDAController extends BaseController {
     }
 
     //传故障类型
-//    @GetMapping(value = "/queryEquFaultTypeTree")
+    @GetMapping(value = "/queryEquFaultTypeTree")
-//    public AjaxResult queryEquFaultTypeTree(EquRepairWorkOrder equRepairWorkOrder) {
+    public AjaxResult queryEquFaultTypeTree(EquRepairWorkOrder equRepairWorkOrder) {
-//        return devicePDAService.queryEquFaultTypeTree(equRepairWorkOrder);
+        return devicePDAService.queryEquFaultTypeTree(equRepairWorkOrder);
-//    }
+    }
 
     /**
      * 开始保养任务

op-modules/op-device/src/main/java/com/op/device/controller/EquRepairWorkOrderController.java

@@ -4,6 +4,7 @@ import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
 import com.op.device.domain.EquTeamUser;
+import com.op.device.service.IDevicePDAService;
 import com.op.device.service.IEquOutsourceWorkService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -39,6 +40,9 @@ public class EquRepairWorkOrderController extends BaseController {
 	@Autowired
 	private IEquOutsourceWorkService equOutsourceWorkService;
 
+	@Autowired
+	private IDevicePDAService devicePDAService;
+
 	/**
 	 * 查询维修工单列表
 	 */
@@ -127,4 +131,10 @@ public class EquRepairWorkOrderController extends BaseController {
 		List<EquTeamUser> list = equRepairWorkOrderService.getMaintenancePersonList(equTeamUser);
 		return getDataTable(list);
 	}
+
+	//传故障类型
+	@GetMapping(value = "/queryEquFaultTypeTree")
+	public AjaxResult queryEquFaultTypeTree(EquRepairWorkOrder equRepairWorkOrder) {
+		return devicePDAService.queryEquFaultTypeTree(equRepairWorkOrder);
+	}
 }

op-modules/op-device/src/main/java/com/op/device/domain/EquFaultTypeTree.java

@@ -0,0 +1,46 @@
+package com.op.device.domain;
+
+import com.op.common.core.annotation.Excel;
+import com.op.common.core.web.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 故障类型树
+ *
+ */
+
+public class EquFaultTypeTree extends BaseEntity {
+	private String value;
+
+	private String label;
+
+	private List<EquFaultTypeTree> children;
+
+	public String getValue() {
+		return value;
+	}
+
+	public void setValue(String value) {
+		this.value = value;
+	}
+
+	public String getLabel() {
+		return label;
+	}
+
+	public void setLabel(String label) {
+		this.label = label;
+	}
+
+	public List<EquFaultTypeTree> getChildren() {
+		return children;
+	}
+
+	public void setChildren(List<EquFaultTypeTree> children) {
+		this.children = children;
+	}
+}

op-modules/op-device/src/main/java/com/op/device/domain/EquRepairWorkOrder.java

@@ -219,6 +219,8 @@ public class EquRepairWorkOrder extends BaseEntity {
 	private String workOutsourcingUnit;
 	/** 联系方式 */
 	private String outSourceConnection;
+	/** 故障类型 */
+	private String faultType;
 
 	//手持
 	//用户id
@@ -712,6 +714,14 @@ public class EquRepairWorkOrder extends BaseEntity {
 		this.standardList = standardList;
 	}
 
+	//故障类型
+	public String getFaultType() {
+		return faultType;
+	}
+	public void setFaultType(String faultType) {
+		this.faultType = faultType;
+	}
+
 	@Override
 	public String toString() {
 		return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

op-modules/op-device/src/main/java/com/op/device/mapper/EquFaultTypeMapper.java

@@ -2,6 +2,7 @@ package com.op.device.mapper;
 
 import java.util.List;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.op.device.domain.EquFaultType;
 import com.op.device.domain.EquRepairWorkOrder;
 
@@ -67,5 +68,9 @@ public interface EquFaultTypeMapper {
     int selectSerialNumber();
 
     //故障报修第一级
+	@DS("master")
 	List<EquFaultType> selectFirstLevelList(EquRepairWorkOrder equRepairWorkOrder);
+
+	//故障报修第二级
+	List<EquFaultType> selectSecondLevelList(String dictValue);
 }

op-modules/op-device/src/main/java/com/op/device/service/IDevicePDAService.java

@@ -108,7 +108,7 @@ public interface IDevicePDAService {
     public AjaxResult updateMaintenanceRecords(EquRepairWorkOrder equRepairWorkOrder);
 
     //获取设备故障类型
-//    public AjaxResult queryEquFaultTypeTree(EquRepairWorkOrder equRepairWorkOrder);
+    public AjaxResult queryEquFaultTypeTree(EquRepairWorkOrder equRepairWorkOrder);
 
     //待处理
     AjaxResult getMaintenancePendRecords(EquRepairWorkOrder equRepairWorkOrder);

op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java

@@ -667,7 +667,7 @@ public class DevicePDAServiceImpl implements IDevicePDAService {
     @Override
     @DS("#header.poolName")
     public AjaxResult updateMaintenanceRecords(EquRepairWorkOrder equRepairWorkOrder) {
-//        try {
+        try {
             //判断是否停机
             EquRepairWorkOrder list = equRepairWorkOrderMapper.selectEquRepairWorkOrderByWorkId(equRepairWorkOrder.getWorkId());
             if (list.getWorkDownMachine().equals("1")) {
@@ -803,9 +803,9 @@ public class DevicePDAServiceImpl implements IDevicePDAService {
             equRepairWorkOrderMapper.updateEquipmentStatus(equEquipment);
 
             return success("提交成功，维修完成！");
-//        } catch (Exception e) {
+        } catch (Exception e) {
-//            return error("提交失败！");
+            return error("提交失败！");
-//        }
+        }
     }
 
     /**
@@ -814,22 +814,38 @@ public class DevicePDAServiceImpl implements IDevicePDAService {
      * @param equRepairWorkOrder
      * @return
      */
-//    @Override
+    @Override
-//    @DS("#header.poolName")
+    @DS("#header.poolName")
-//    public AjaxResult queryEquFaultTypeTree(EquRepairWorkOrder equRepairWorkOrder) {
+    public AjaxResult queryEquFaultTypeTree(EquRepairWorkOrder equRepairWorkOrder) {
-//        // 查询一级数据
+        // 查询一级数据
-//        List<EquFaultType> firstLevel = equFaultTypeMapper.selectFirstLevelList(equRepairWorkOrder);
+        List<EquFaultType> firstLevel = equFaultTypeMapper.selectFirstLevelList(equRepairWorkOrder);
-//        // 一级list
+        // 一级list
-//        List<EquFaultTypeTree> firstTree = new ArrayList<>();
+        List<EquFaultTypeTree> firstTree = new ArrayList<>();
-//        // 判空
+        // 判空
-//        if (!CollectionUtils.isEmpty(firstLevel)) {
+        if (!CollectionUtils.isEmpty(firstLevel)) {
-//          for(EquFaultType equFaultType : firstLevel){
+          for(EquFaultType equFaultType : firstLevel){
-//
+              EquFaultTypeTree equFaultTypeParentTree = new EquFaultTypeTree();
-//          }
+              equFaultTypeParentTree.setValue(equFaultType.getDictValue());
-//        }
+              equFaultTypeParentTree.setLabel(equFaultType.getDictLabel());
-//
+              //二级
-//        return treeAll;
+              List <EquFaultType> secondLevel = equFaultTypeMapper.selectSecondLevelList(equFaultType.getDictValue());
-//    }
+              // 二级list
+              List<EquFaultTypeTree> secondTree = new ArrayList<>();
+              // 判空
+              if (!CollectionUtils.isEmpty(secondLevel)) {
+                  for(EquFaultType second : secondLevel) {
+                      EquFaultTypeTree equFaultTypeChildTree = new EquFaultTypeTree();
+                      equFaultTypeChildTree.setValue(second.getFaultCode());
+                      equFaultTypeChildTree.setLabel(second.getFaultSubclass());
+                      secondTree.add(equFaultTypeChildTree);
+                  }
+              }
+              equFaultTypeParentTree.setChildren(secondTree);
+              firstTree.add(equFaultTypeParentTree);
+          }
+        }
+        return success(firstTree);
+    }
 
     /**
      * 查询设备管理列表

op-modules/op-device/src/main/resources/mapper/device/EquFaultTypeMapper.xml

@@ -131,13 +131,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		</foreach>
 	</delete>
 
-
+	<select id="selectFirstLevelList" resultType="com.op.device.domain.EquFaultType">
-	<select id="selectFirstLevelList" resultMap="EquFaultTypeResult">
 		SELECT
-		  dict_label AS dictLabel
+		  dict_label AS dictLabel,
 		  dict_value AS dictValue
 		FROM sys_dict_data
 		WHERE dict_type = 'device_fault_type'
 	</select>
 
+	<select id="selectSecondLevelList" resultType="com.op.device.domain.EquFaultType">
+		SELECT
+		  fault_code AS faultCode,
+		  fault_subclass AS faultSubclass
+		FROM equ_fault_type
+		WHERE fault_type = #{dictValue}
+		and del_flag = '0'
+	</select>
+
 </mapper>

op-modules/op-device/src/main/resources/mapper/device/EquRepairWorkOrderMapper.xml

@@ -40,6 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="updateBy"	column="update_by"	/>
 		<result property="delFlag"	column="del_flag"	/>
 		<result property="factoryCode"	column="factory_code"	/>
+		<result property="faultType"	column="fault_type"	/>
          <!--设备-->
 		<result property="equipmentName"	column="equipment_name"	/>
 		<result property="equipmentSpec"	column="equipment_spec"	/>
@@ -84,7 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</sql>
 
 	<sql id="selectEquRepairWorkOrderVo">
-		select work_id, order_id, order_code, work_code,work_handle, work_plan_time, work_plan_down_time, order_relevance, work_person, work_team, work_outsource, work_down_machine, equipment_code, work_reason, work_fault_desc, work_start_time,work_end_time,work_cost_time, work_cost, work_status,out_work_id, out_work_code, attr1, attr2, attr3, create_by, create_time, update_time, update_by, del_flag, factory_code from equ_repair_work_order
+		select work_id, order_id, order_code, work_code,work_handle, work_plan_time, work_plan_down_time, order_relevance, work_person, work_team, work_outsource, work_down_machine, equipment_code, work_reason, work_fault_desc, work_start_time,work_end_time,work_cost_time, work_cost, work_status,out_work_id, out_work_code, attr1, attr2, attr3, create_by, create_time, update_time, update_by, del_flag, factory_code ,fault_type from equ_repair_work_order
 	</sql>
 
 	<select id="selectEquRepairWorkOrderList" parameterType="EquRepairWorkOrder" resultMap="EquRepairWorkOrderResult">
@@ -123,6 +124,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			erwo.update_by,
 			erwo.del_flag,
 			erwo.factory_code,
+			erwo.fault_type,
 		    be.equipment_name,
 		    et.team_name,
 		    et.team_person
@@ -201,6 +203,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		erwo.update_by,
 		erwo.del_flag,
 		erwo.factory_code,
+		erwo.fault_type,
 		be.equipment_name,
 		et.team_name,
 		et.team_person
@@ -248,6 +251,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			erwo.update_time,
 			erwo.update_by,
 			erwo.factory_code,
+		    erwo.fault_type,
 		    be.equipment_name,
 			be.equipment_spec,
 			be.equipment_type_name,
@@ -311,6 +315,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="updateBy != null">update_by,</if>
 			<if test="delFlag != null">del_flag,</if>
 			<if test="factoryCode != null">factory_code,</if>
+			<if test="faultType != null">fault_type,</if>
 		 </trim>
 		<trim prefix="values (" suffix=")" suffixOverrides=",">
 			<if test="workId != null">#{workId},</if>
@@ -347,6 +352,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="updateBy != null">#{updateBy},</if>
 			<if test="delFlag != null">#{delFlag},</if>
 			<if test="factoryCode != null">#{factoryCode},</if>
+			<if test="faultType != null">#{fault_type},</if>
 		 </trim>
 	</insert>
 
@@ -386,6 +392,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="updateBy != null">update_by = #{updateBy},</if>
 			<if test="delFlag != null">del_flag = #{delFlag},</if>
 			<if test="factoryCode != null">factory_code = #{factoryCode},</if>
+			<if test="faultType != null">fault_type = #{faultType},</if>
 		</trim>
 		where work_id = #{workId}
 		and del_flag = '0'

op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskIncomeController.java

@@ -222,4 +222,11 @@ public class QcCheckTaskIncomeController extends BaseController {
 		return qcCheckTaskIncomeService.getDefectList(qcDefectType);
 	}
 
+	/**获取来料工单列表**/
+	@GetMapping("/getLLWorkOrder")
+	public TableDataInfo getLLWorkOrder(QcCheckTaskIncome qcCheckTaskIncome) {
+		startPage();
+		List<QcCheckTaskIncome> list = qcCheckTaskIncomeService.getLLWorkOrder(qcCheckTaskIncome);
+		return getDataTable(list);
+	}
 }

op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java

@@ -258,4 +258,13 @@ public class QuaController extends BaseController {
         List<QcCheckUnqualified> list = qcCheckUnqualifiedService.selectQcCheckUnqualifiedList(qcCheckUnqualified);
         return getDataTable(list);
     }
+
+    /**获取来料工单列表**/
+    @GetMapping("/getLLWorkOrder")
+    public TableDataInfo getLLWorkOrder(QcCheckTaskIncome qcCheckTaskIncome) {
+        DynamicDataSourceContextHolder.push("ds_"+qcCheckTaskIncome.getFactoryCode());
+        startPage();
+        List<QcCheckTaskIncome> list = qcCheckTaskIncomeService.getLLWorkOrder(qcCheckTaskIncome);
+        return getDataTable(list);
+    }
 }

op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskIncome.java

@@ -122,6 +122,15 @@ public class QcCheckTaskIncome extends BaseEntity {
 	private String checkTimeEnd;
 	private String typeCode;
 	private String checkType;
+    private String qualityStatus;
+
+	public String getQualityStatus() {
+		return qualityStatus;
+	}
+
+	public void setQualityStatus(String qualityStatus) {
+		this.qualityStatus = qualityStatus;
+	}
 
 	public BigDecimal getNoOkQuality() {
 		return noOkQuality;

op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckUnqualifiedMapper.java

@@ -2,6 +2,7 @@ package com.op.quality.mapper;
 
 import java.util.List;
 
+import com.op.quality.domain.QcCheckTaskIncome;
 import com.op.quality.domain.QcCheckUnqualified;
 import com.op.quality.domain.QcDefectType;
 import org.apache.ibatis.annotations.Mapper;
@@ -71,4 +72,8 @@ public interface QcCheckUnqualifiedMapper {
 	 * @return 不合格处理集合
 	 */
 	public List<QcCheckUnqualified> getUnqualifiedList(QcCheckUnqualified qcCheckUnqualified);
+
+    public List<QcCheckTaskIncome> getLLWorkOrder(QcCheckTaskIncome qcCheckTaskIncome);
+
+	void updateQualityStatus(QcCheckTaskIncome qcCheckTaskIncome);
 }

op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskIncomeService.java

@@ -80,4 +80,5 @@ public interface IQcCheckTaskIncomeService {
 
     List<QcDefectType> getDefectList(QcDefectType qcDefectType);
 
+    List<QcCheckTaskIncome> getLLWorkOrder(QcCheckTaskIncome qcCheckTaskIncome);
 }

op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java

@@ -112,15 +112,18 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService {
 		qctp.setMaterialCode(qcCheckTaskIncome.getMaterialCode());//特性
 		/**qc_check_type_project**/
         List<QcCheckTaskDetail> items = qcCheckTypeProjectMapper.getTPByTypeMaterial(qctp);
-        if(CollectionUtils.isEmpty(items)){
+
-        	/**qc_material_group_detail**/
+		/**qc_material_group_detail**/
-			QcMaterialGroupDetail group = qcMaterialGroupDetailMapper.getGroupByMaterial(qcCheckTaskIncome.getMaterialCode());
+		//个性
-			if(group == null){
+		QcMaterialGroupDetail group = qcMaterialGroupDetailMapper.getGroupByMaterial(qcCheckTaskIncome.getMaterialCode());
-               return 0;//没有找到检测项目
+		if(group == null){
-			}
+		   return 0;//没有找到检测项目
-			qctp.setGroupId(group.getGroupId());//共性
-			items = qcCheckTypeProjectMapper.getTPByTypeGroup(qctp);
 		}
+		//共性
+		qctp.setGroupId(group.getGroupId());
+		List<QcCheckTaskDetail> itemsGG = qcCheckTypeProjectMapper.getTPByTypeGroup(qctp);
+
+		items.addAll(itemsGG);
 
 		/**qc_check_task_detail**/
 		if(CollectionUtils.isEmpty(items)){
@@ -280,6 +283,10 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService {
 			qcCheckUnqualifiedMapper.insertQcCheckUnqualified(unqualified);
 		}
 
+		/**wms_raw_order_in-->quality_status->**/
+		qcCheckTaskIncome.setCheckResult(result.equals("Y")?"1":"0");
+		qcCheckUnqualifiedMapper.updateQualityStatus(qcCheckTaskIncome);
+
 		return n ;
 	}
 
@@ -289,6 +296,12 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService {
 		return qcCheckUnqualifiedMapper.getDefectList(qcDefectType);
 	}
 
+	@Override
+	@DS("#header.poolName")
+	public List<QcCheckTaskIncome> getLLWorkOrder(QcCheckTaskIncome qcCheckTaskIncome) {
+		return qcCheckUnqualifiedMapper.getLLWorkOrder(qcCheckTaskIncome);
+	}
+
 	@Override
 	public int commitCheckResults(List<QcCheckTaskDetail> details) {
 		DynamicDataSourceContextHolder.push("ds_"+details.get(0).getFactoryCode());

op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTypeProjectMapper.xml

@@ -121,7 +121,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			   <!--,qcp.check_standard checkStandard-->
 		from qc_check_type_project qctp
 		left join qc_check_project qcp on qcp.id = qctp.project_id
-		where qctp.del_flag = '0' and qctp.status = '0'
+		where qctp.del_flag = '0' and qctp.status = '1'
              and qctp.material_code = #{materialCode}
 		     and qctp.type_id = #{typeId}
 		order by qctp.sort
@@ -143,7 +143,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			   <!--,qcp.check_standard checkStandard-->
 		from qc_check_type_project qctp
 		left join qc_check_project qcp on qcp.id = qctp.project_id
-		where qctp.del_flag = '0' and qctp.status = '0'
+		where qctp.del_flag = '0' and qctp.status = '1'
 		  and qctp.group_id = #{groupId}
 		  and qctp.type_id = #{typeId}
 		order by qctp.sort

op-modules/op-quality/src/main/resources/mapper/quality/QcCheckUnqualifiedMapper.xml

@@ -85,6 +85,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		left join qc_check_type qtn on qtn.id = qct.check_type
 		where qcu.id = #{id}
 	</select>
+    <select id="getLLWorkOrder" resultType="com.op.quality.domain.QcCheckTaskIncome">
+		select wroi.raw_order_in_id recordId,
+			wroi.order_no orderNo,
+			wroi.material_code materialCode,
+			wroi.material_desc materialName,
+			wroi.user_defined1 incomeBatchNo,
+			wroi.supply_code supplierCode,
+			wroi.receipt_amount quality,
+			wroi.unit,
+			wroi.send_spot checkLoc,
+			wroi.quality_status qualityStatus,
+			bs.zh_desc supplierName,
+		    wroi.request_time incomeTime
+		from wms_raw_order_in  wroi
+		left join base_supplier bs on bs.supplier_code = wroi.supply_code
+		where wroi.active_flag = '1' and wroi.quality_status = '0'
+		<if test="orderNo != null">and wroi.order_no like contact like ('%',#{orderNo})</if>
+	</select>
 
     <insert id="insertQcCheckUnqualified" parameterType="QcCheckUnqualified">
 		insert into qc_check_unqualified
@@ -149,6 +167,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		</trim>
 		where id = #{id}
 	</update>
+	<update id="updateQualityStatus">
+        update wms_raw_order_in set quality_status = #{checkResult}
+        where order_no = #{orderNo}
+	</update>
 
 	<delete id="deleteQcCheckUnqualifiedById" parameterType="String">
 		delete from qc_check_unqualified where id = #{id}