来料检验修改测试

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**/
-			QcMaterialGroupDetail group = qcMaterialGroupDetailMapper.getGroupByMaterial(qcCheckTaskIncome.getMaterialCode());
-			if(group == null){
-               return 0;//没有找到检测项目
-			}
-			qctp.setGroupId(group.getGroupId());//共性
-			items = qcCheckTypeProjectMapper.getTPByTypeGroup(qctp);
+
+		/**qc_material_group_detail**/
+		//个性
+		QcMaterialGroupDetail group = qcMaterialGroupDetailMapper.getGroupByMaterial(qcCheckTaskIncome.getMaterialCode());
+		if(group == null){
+		   return 0;//没有找到检测项目
 		}
+		//共性
+		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}