Merge remote-tracking branch 'origin/master'

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

@@ -249,6 +249,15 @@ public class QcCheckTaskIncomeController extends BaseController {
 		List<QcCheckTaskIncome> list = qcCheckTaskIncomeService.getWorkOrder(qcCheckTaskIncome);
 		return getDataTable(list);
 	}
+	/**获取入库工单列表**/
+	@GetMapping("/getProductWorkOrder")
+	public TableDataInfo getProductWorkOrder(QcCheckTaskIncome qcCheckTaskIncome) {
+		startPage();
+		List<QcCheckTaskIncome> list = qcCheckTaskIncomeService.getProductWorkOrder(qcCheckTaskIncome);
+		return getDataTable(list);
+	}
+
+
 	@PutMapping("/getBatchList")
 	public List<QcCheckTaskIncome> getBatchList(@RequestBody QcCheckTaskIncome qcCheckTaskIncome) {
 		return qcCheckTaskIncomeService.getBatchList(qcCheckTaskIncome);

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

@@ -80,4 +80,6 @@ public interface QcCheckUnqualifiedMapper {
     List<QcCheckTaskIncome> getWorkOrder(QcCheckTaskIncome qcCheckTaskIncome);
 
 	int updateWorkOrderBatchStatus(QcCheckTaskIncome qcCheckTaskIncome);
+
+    List<QcCheckTaskIncome> getProductWorkOrder(QcCheckTaskIncome qcCheckTaskIncome);
 }

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

@@ -85,4 +85,6 @@ public interface IQcCheckTaskIncomeService {
     List<QcCheckTaskIncome> getWorkOrder(QcCheckTaskIncome qcCheckTaskIncome);
 
 	List<QcCheckTaskIncome> getBatchList(QcCheckTaskIncome qcCheckTaskIncome);
+
+    List<QcCheckTaskIncome> getProductWorkOrder(QcCheckTaskIncome qcCheckTaskIncome);
 }

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

@@ -433,6 +433,22 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService {
 		return qcCheckTaskIncomeMapper.getBatchList(qcCheckTaskIncome);
 	}
 
+	@Override
+	@DS("#header.poolName")
+	public List<QcCheckTaskIncome> getProductWorkOrder(QcCheckTaskIncome qcCheckTaskIncome) {
+		List<QcCheckTaskIncome> dtos = qcCheckUnqualifiedMapper.getProductWorkOrder(qcCheckTaskIncome);
+		for(QcCheckTaskIncome dto:dtos){
+			String statusName = "";
+			if("w5".equals(dto.getStatus())){
+				statusName = "质检完成";
+			}else{
+				statusName = "质检未完成";
+			}
+			dto.setStatus(statusName);
+		}
+		return dtos;
+	}
+
 	@Override
 	public int commitCheckResults(QcCheckTaskIncome qcCheckTaskIncome) {
 		List<QcCheckTaskDetail> details = qcCheckTaskIncome.getQcCheckTaskDetails();

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

@@ -118,8 +118,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<if test="orderNo != null">and workorder_code_sap like concat like ('%',#{orderNo})</if>
 		order by product_date desc
 	</select>
+	<select id="getProductWorkOrder" resultType="com.op.quality.domain.QcCheckTaskIncome">
+		select work_order orderNo,
+			   product_name materialName,
+			   product_code materialCode,
+			   batch_number incomeBatchNo,
+			   plan_quantity quality,
+			   status,
+			   create_time incomeTime
+		from wms_product_put
+		where 1=1
+		<if test="orderNo != null">and work_order like concat like ('%',#{orderNo})</if>
+		order by create_time desc
+	</select>
 
-    <insert id="insertQcCheckUnqualified" parameterType="QcCheckUnqualified">
+	<insert id="insertQcCheckUnqualified" parameterType="QcCheckUnqualified">
 		insert into qc_check_unqualified
 		<trim prefix="(" suffix=")" suffixOverrides=",">
 			<if test="id != null">id,</if>