质量改动

op-api/op-api-system/src/main/java/com/op/system/api/RemoteOpenService.java

@@ -5,6 +5,9 @@ import com.op.common.core.web.domain.AjaxResult;
 import com.op.system.api.factory.RemoteOpenFallbackFactory;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.Map;
 
 /**
  * Open接口服务
@@ -15,6 +18,6 @@ import org.springframework.web.bind.annotation.PostMapping;
 public interface RemoteOpenService {
     /**提交ZL0010-来料检验不合格控制流程**/
     @PostMapping("/openInterface/OAInspection")
-    public AjaxResult OAInspection();
+    public AjaxResult OAInspection(@RequestBody(required = false) Map<String, Object> paramMap);
 
 }

op-api/op-api-system/src/main/java/com/op/system/api/factory/RemoteOpenFallbackFactory.java

@@ -7,6 +7,9 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.cloud.openfeign.FallbackFactory;
 import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.Map;
 
 @Component
 public class RemoteOpenFallbackFactory implements FallbackFactory<RemoteOpenService> {
@@ -16,7 +19,7 @@ public class RemoteOpenFallbackFactory implements FallbackFactory<RemoteOpenServ
         log.error("Open服务调用失败:{}", throwable.getMessage());
         return new RemoteOpenService() {
             @Override
-            public AjaxResult OAInspection() {
+            public AjaxResult OAInspection(@RequestBody(required = false) Map<String, Object> paramMap) {
                 return AjaxResult.error("提交ZL0010-来料检验不合格控制流程失败"+throwable.getMessage());
             }
         };

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

@@ -2,13 +2,18 @@ package com.op.quality.controller;
 
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import javax.servlet.http.HttpServletResponse;
 
+import com.alibaba.fastjson2.JSONObject;
+import com.op.common.core.domain.R;
 import com.op.common.core.utils.DateUtils;
 import com.op.common.core.utils.bean.BeanUtils;
 import com.op.common.security.utils.SecurityUtils;
 import com.op.quality.domain.*;
+import com.op.system.api.RemoteOpenService;
 import com.op.system.api.domain.SysRole;
 import com.op.system.api.domain.SysUser;
 import com.op.system.api.domain.quality.QcCheckTaskIncomeDTO;
@@ -123,7 +128,7 @@ public class QcCheckTaskIncomeController extends BaseController {
 	@PostMapping("/createIncomeTask")
 	public AjaxResult createIncomeTask(@RequestBody QcCheckTaskIncomeDTO qcCheckTaskIncome0) {
 		QcCheckTaskIncome qcCheckTaskIncome = new QcCheckTaskIncome();
-		BeanUtils.copyProperties(qcCheckTaskIncome,qcCheckTaskIncome0);
+		BeanUtils.copyProperties(qcCheckTaskIncome0,qcCheckTaskIncome);
 		int r = qcCheckTaskIncomeService.insertQcCheckTaskIncome(qcCheckTaskIncome);
 		if(r>0){
 			return toAjax(r);

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

@@ -232,11 +232,8 @@ public class QcStaticTableController extends BaseController {
 	 */
 	@RequiresPermissions("quality:qcTableXJ:list")
 	@GetMapping("/getXJCheckTableList")
-	public List<QcStaticTable> getXJCheckTableList(QcStaticTable qcStaticTable) {
-		if(StringUtils.isNotBlank(qcStaticTable.getSupplierCode())){
-			List<String> codes = Arrays.asList(qcStaticTable.getSupplierCode().split(","));
-			qcStaticTable.setSupplierCodes(codes);
-		}
+	public TableDataInfo getXJCheckTableList(QcStaticTable qcStaticTable) {
+
 		//默认时间范围T 00:00:00~T+1 00:00:00
 		if(StringUtils.isEmpty(qcStaticTable.getYearMonth())){
 			LocalDate date = LocalDate.now();
@@ -246,6 +243,12 @@ public class QcStaticTableController extends BaseController {
 		}
 		startPage();
 		List<QcStaticTable> list = qcStaticTableService.getXJCheckTableList(qcStaticTable);
+		return getDataTable(list);
+	}
+
+	@GetMapping("/getXJCheckTableDetail")
+	public List<QcStaticTable> getXJCheckTableDetail(QcStaticTable qcStaticTable) {
+		List<QcStaticTable> list = qcStaticTableService.getXJCheckTableDetail(qcStaticTable);
 		return list;
 	}
 }

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

@@ -1,10 +1,12 @@
 package com.op.quality.domain;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.op.common.core.annotation.Excel;
 import com.op.common.core.web.domain.BaseEntity;
 import com.op.system.api.domain.quality.ChartDTO;
 
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -54,6 +56,242 @@ public class QcStaticTable extends BaseEntity {
 	private String dataType;
 	private String workCenter;
 
+	private String recordId;
+	private String checkNo;
+	private String orderNo;
+	private String incomeBatchNo;
+	private String quality;
+	private String unit;
+	@JsonFormat(pattern = "yyyy-MM-dd")
+	private Date incomeTime;
+	private String checkManCode;
+	private String checkManName;
+	private String ruleName;
+	private String projectId;
+	private String projectNo;
+    private String status;
+    private String ymdms;
+	private String column080090;
+	private String column090100;
+	private String column100110;
+	private String column110120;
+	private String column123133;
+	private String column133143;
+	private String column143153;
+	private String column153163;
+	private String column163173;
+	private String column180190;
+	private String column190200;
+	private String column200210;
+
+	public String getColumn080090() {
+		return column080090;
+	}
+
+	public void setColumn080090(String column080090) {
+		this.column080090 = column080090;
+	}
+
+	public String getColumn090100() {
+		return column090100;
+	}
+
+	public void setColumn090100(String column090100) {
+		this.column090100 = column090100;
+	}
+
+	public String getColumn100110() {
+		return column100110;
+	}
+
+	public void setColumn100110(String column100110) {
+		this.column100110 = column100110;
+	}
+
+	public String getColumn110120() {
+		return column110120;
+	}
+
+	public void setColumn110120(String column110120) {
+		this.column110120 = column110120;
+	}
+
+	public String getColumn123133() {
+		return column123133;
+	}
+
+	public void setColumn123133(String column123133) {
+		this.column123133 = column123133;
+	}
+
+	public String getColumn133143() {
+		return column133143;
+	}
+
+	public void setColumn133143(String column133143) {
+		this.column133143 = column133143;
+	}
+
+	public String getColumn143153() {
+		return column143153;
+	}
+
+	public void setColumn143153(String column143153) {
+		this.column143153 = column143153;
+	}
+
+	public String getColumn153163() {
+		return column153163;
+	}
+
+	public void setColumn153163(String column153163) {
+		this.column153163 = column153163;
+	}
+
+	public String getColumn163173() {
+		return column163173;
+	}
+
+	public void setColumn163173(String column163173) {
+		this.column163173 = column163173;
+	}
+
+	public String getColumn180190() {
+		return column180190;
+	}
+
+	public void setColumn180190(String column180190) {
+		this.column180190 = column180190;
+	}
+
+	public String getColumn190200() {
+		return column190200;
+	}
+
+	public void setColumn190200(String column190200) {
+		this.column190200 = column190200;
+	}
+
+	public String getColumn200210() {
+		return column200210;
+	}
+
+	public void setColumn200210(String column200210) {
+		this.column200210 = column200210;
+	}
+
+	public String getStatus() {
+		return status;
+	}
+
+	public void setStatus(String status) {
+		this.status = status;
+	}
+
+	public String getYmdms() {
+		return ymdms;
+	}
+
+	public void setYmdms(String ymdms) {
+		this.ymdms = ymdms;
+	}
+
+	public String getRuleName() {
+		return ruleName;
+	}
+
+	public void setRuleName(String ruleName) {
+		this.ruleName = ruleName;
+	}
+
+	public String getProjectId() {
+		return projectId;
+	}
+
+	public void setProjectId(String projectId) {
+		this.projectId = projectId;
+	}
+
+	public String getProjectNo() {
+		return projectNo;
+	}
+
+	public void setProjectNo(String projectNo) {
+		this.projectNo = projectNo;
+	}
+
+	public String getRecordId() {
+		return recordId;
+	}
+
+	public void setRecordId(String recordId) {
+		this.recordId = recordId;
+	}
+
+	public String getCheckNo() {
+		return checkNo;
+	}
+
+	public void setCheckNo(String checkNo) {
+		this.checkNo = checkNo;
+	}
+
+	public String getOrderNo() {
+		return orderNo;
+	}
+
+	public void setOrderNo(String orderNo) {
+		this.orderNo = orderNo;
+	}
+
+	public String getIncomeBatchNo() {
+		return incomeBatchNo;
+	}
+
+	public void setIncomeBatchNo(String incomeBatchNo) {
+		this.incomeBatchNo = incomeBatchNo;
+	}
+
+	public String getQuality() {
+		return quality;
+	}
+
+	public void setQuality(String quality) {
+		this.quality = quality;
+	}
+
+	public String getUnit() {
+		return unit;
+	}
+
+	public void setUnit(String unit) {
+		this.unit = unit;
+	}
+
+	public Date getIncomeTime() {
+		return incomeTime;
+	}
+
+	public void setIncomeTime(Date incomeTime) {
+		this.incomeTime = incomeTime;
+	}
+
+	public String getCheckManCode() {
+		return checkManCode;
+	}
+
+	public void setCheckManCode(String checkManCode) {
+		this.checkManCode = checkManCode;
+	}
+
+	public String getCheckManName() {
+		return checkManName;
+	}
+
+	public void setCheckManName(String checkManName) {
+		this.checkManName = checkManName;
+	}
+
 	public String getWorkCenter() {
 		return workCenter;
 	}

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

@@ -39,4 +39,10 @@ public interface QcStaticTableMapper {
 	Map<String, QcStaticTable> getProduceChartDataYM(QcStaticTable qcStaticTable);
 
 	List<FactoryDto> getWorkcenterList(FactoryDto factoryDto);
+
+    List<QcStaticTable> getXJCheckTableList(QcStaticTable qcStaticTable);
+
+	List<QcStaticTable> getXJProjects(QcStaticTable qcStaticTable);
+	@MapKey("ymdms")
+	Map<String,QcStaticTable> getProjectDetail(QcStaticTable qcStaticTable);
 }

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

@@ -31,4 +31,6 @@ public interface IQcStaticTableService {
 	List<FactoryDto> getWorkcenterList(FactoryDto factoryDto);
 
     List<QcStaticTable> getXJCheckTableList(QcStaticTable qcStaticTable);
+
+    List<QcStaticTable> getXJCheckTableDetail(QcStaticTable qcStaticTable);
 }

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

@@ -1,21 +1,21 @@
 package com.op.quality.service.impl;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
+import java.util.*;
+import com.alibaba.fastjson2.JSONObject;
 import com.alibaba.fastjson2.JSONArray;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
 import com.op.common.core.utils.DateUtils;
 import com.op.common.core.utils.StringUtils;
 import com.op.common.core.utils.uuid.IdUtils;
+import com.op.common.core.web.domain.AjaxResult;
 import com.op.common.security.utils.SecurityUtils;
 import com.op.quality.domain.*;
 import com.op.quality.mapper.*;
 import com.op.quality.service.IQcCheckTaskProduceService;
 import com.op.quality.service.IQcCheckTaskUserService;
+import com.op.system.api.RemoteOpenService;
 import com.op.system.api.domain.SysUser;
 import com.op.system.api.domain.quality.QcUserMaterialDTO;
 import org.slf4j.Logger;
@@ -63,6 +63,9 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService {
 	@Autowired
 	private IQcCheckTaskUserService qcCheckTaskUserService;
 
+	@Autowired
+	private RemoteOpenService remoteOpenService;
+
 	/**
 	 * 查询来料检验
 	 *
@@ -96,8 +99,8 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService {
 	 * @return 结果
 	 */
 	@Override
-	@DS("#header.poolName")
 	public int insertQcCheckTaskIncome(QcCheckTaskIncome qcCheckTaskIncome) {
+		DynamicDataSourceContextHolder.push("ds_" +qcCheckTaskIncome.getFactoryCode());
 
 		String bpDD = DateUtils.parseDateToStr(DateUtils.YYYYMMDD, DateUtils.getNowDate());
 		int liushuiNum = qcCheckTaskIncomeMapper.getTodayMaxNum(qcCheckTaskIncome);
@@ -527,6 +530,25 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService {
 			/**qc_check_unqualified**/
 			n = qcCheckUnqualifiedMapper.insertQcCheckUnqualified(unqualified);
 			logger.info("qc_check_unqualified:"+n);
+
+			//发起来料检验OA流程
+			Map<String, Object> paramMap = new HashMap<>();
+			paramMap.put("user",updateBy);//提交人工号
+			paramMap.put("requestLevel",0);//流程紧急度
+			paramMap.put("requestName","ZL0010-来料检验不合格审批流程(定单:"+qcCheckTaskIncome.getOrderNo()+")");//流程名称
+			paramMap.put("workflowld","26258");//该流程对应的唯- workFlowld
+
+			StringBuffer mainObject = new StringBuffer();
+			mainObject.append("{");
+			mainObject.append("\"CQ\":"+1);//厂区
+			mainObject.append("\"LLLB\":"+0);//来料类别【0、1】
+			mainObject.append("\"MATNR\""+"\"000000010101003200\"");//物料编码
+			//mainObject.append("\"MAKTX\""+MATNR);//物料名称
+			mainObject.append("{");
+			paramMap.put("mainObject",mainObject.toString());
+
+			AjaxResult oaR = remoteOpenService.OAInspection(paramMap);
+			logger.info("流程Id 26258:"+ JSONObject.toJSONString(oaR));
 		}
 
 		return n ;

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

@@ -5,7 +5,7 @@ import java.util.List;
 import java.util.Map;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
-import com.op.common.core.utils.DateUtils;
+import com.op.common.core.utils.StringUtils;
 import com.op.system.api.domain.quality.FactoryDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -136,11 +136,122 @@ public class QcStaticTableServiceImpl implements IQcStaticTableService {
 		return qcStaticTableMapper.getWorkcenterList(factoryDto);
 	}
 
-	/**巡检**/
+	/**巡检记录**/
 	@Override
+	@DS("#header.poolName")
 	public List<QcStaticTable> getXJCheckTableList(QcStaticTable qcStaticTable) {
-		return null;
+		List<QcStaticTable> tabledtos =  qcStaticTableMapper.getXJCheckTableList(qcStaticTable);
+		return tabledtos;
+	}
+
+	@Override
+	@DS("#header.poolName")
+	public List<QcStaticTable> getXJCheckTableDetail(QcStaticTable qcStaticTable) {
+		List<QcStaticTable> projects =  qcStaticTableMapper.getXJProjects(qcStaticTable);
+		Map<String,QcStaticTable> detailMap = qcStaticTableMapper.getProjectDetail(qcStaticTable);
+		for(QcStaticTable project:projects){
+			this.getDataFromMap(detailMap,project);
+		}
+
+		return projects;
 	}
 
+	private void getDataFromMap(Map<String,QcStaticTable> detailMap,QcStaticTable project){
+		String keystr = project.getProjectId()+"08";
+		QcStaticTable detail = detailMap.get(keystr);
+		if(detail!=null && StringUtils.isNotBlank(detail.getStatus())){
+			project.setColumn080090(detail.getStatus());
+		}else{
+			project.setColumn080090("-");
+		}
+
+		keystr = project.getProjectId()+"09";
+		detail = detailMap.get(keystr);
+		if(detail!=null && StringUtils.isNotBlank(detail.getStatus())){
+			project.setColumn090100(detail.getStatus());
+		}else{
+			project.setColumn090100("-");
+		}
+
+		keystr = project.getProjectId()+"10";
+		detail = detailMap.get(keystr);
+		if(detail!=null && StringUtils.isNotBlank(detail.getStatus())){
+			project.setColumn100110(detail.getStatus());
+		}else{
+			project.setColumn100110("-");
+		}
+
+		keystr = project.getProjectId()+"11";
+		detail = detailMap.get(keystr);
+		if(detail!=null && StringUtils.isNotBlank(detail.getStatus())){
+			project.setColumn110120(detail.getStatus());
+		}else{
+			project.setColumn110120("-");
+		}
+
+		keystr = project.getProjectId()+"12";
+		detail = detailMap.get(keystr);
+		if(detail!=null && StringUtils.isNotBlank(detail.getStatus())){
+			project.setColumn123133(detail.getStatus());
+		}else{
+			project.setColumn123133("-");
+		}
+
+		keystr = project.getProjectId()+"13";
+		detail = detailMap.get(keystr);
+		if(detail!=null && StringUtils.isNotBlank(detail.getStatus())){
+			project.setColumn133143(detail.getStatus());
+		}else{
+			project.setColumn133143("-");
+		}
+
+		keystr = project.getProjectId()+"14";
+		detail = detailMap.get(keystr);
+		if(detail!=null && StringUtils.isNotBlank(detail.getStatus())){
+			project.setColumn143153(detail.getStatus());
+		}else{
+			project.setColumn143153("-");
+		}
+
+		keystr = project.getProjectId()+"15";
+		detail = detailMap.get(keystr);
+		if(detail!=null && StringUtils.isNotBlank(detail.getStatus())){
+			project.setColumn153163(detail.getStatus());
+		}else{
+			project.setColumn153163("-");
+		}
+
+		keystr = project.getProjectId()+"16";
+		detail = detailMap.get(keystr);
+		if(detail!=null && StringUtils.isNotBlank(detail.getStatus())){
+			project.setColumn163173(detail.getStatus());
+		}else{
+			project.setColumn163173("-");
+		}
+
+		keystr = project.getProjectId()+"18";
+		detail = detailMap.get(keystr);
+		if(detail!=null && StringUtils.isNotBlank(detail.getStatus())){
+			project.setColumn180190(detail.getStatus());
+		}else{
+			project.setColumn180190("-");
+		}
+
+		keystr = project.getProjectId()+"19";
+		detail = detailMap.get(keystr);
+		if(detail!=null && StringUtils.isNotBlank(detail.getStatus())){
+			project.setColumn190200(detail.getStatus());
+		}else{
+			project.setColumn190200("-");
+		}
+
+		keystr = project.getProjectId()+"20";
+		detail = detailMap.get(keystr);
+		if(detail!=null && StringUtils.isNotBlank(detail.getStatus())){
+			project.setColumn200210(detail.getStatus());
+		}else{
+			project.setColumn200210("-");
+		}
+	}
 
 }

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

@@ -105,4 +105,53 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			   factory_code factoryCode
 		from sys_factory where f_type = 'c'
 	</select>
+    <select id="getXJCheckTableList" resultType="com.op.quality.domain.QcStaticTable">
+		select distinct check_no checkNo,
+			   order_no orderNo,income_batch_no incomeBatchNo,
+			   material_code materialCode, material_name materialName,
+			   quality,unit,
+			   supplier_code supplierCode,supplier_name supplierName,
+			   income_time incomeTime
+		from qc_check_task
+		where check_type = 'checkTypeSCXJ' and del_flag = '0'
+		<if test="orderNo != null "> and check_no like concat('%',#{orderNo},'%')</if>
+		<if test="materialCode != null "> and material_code like concat('%',#{materialCode},'%')</if>
+		<if test="incomeBatchNo != null "> and income_batch_no like concat('%',#{incomeBatchNo},'%')</if>
+		<if test="incomeTime != null "> and CONVERT(varchar(10),income_time, 120) >= CONVERT(varchar(10),#{incomeTime}, 120)</if>
+		order by income_time desc
+	</select>
+	<select id="getXJProjects" resultType="com.op.quality.domain.QcStaticTable">
+		select  qct.rule_name ruleName,
+				qctp.project_id projectId,
+				qctp.project_no projectNo
+		from qc_check_type_project qctp
+		left join qc_check_project qct on qctp.project_id = qct.id
+		where qctp.type_id = 'checkTypeSCXJ' and qctp.del_flag = '0' and qct.del_flag = '0'
+		order by qctp.sort
+	</select>
+	<select id="getProjectDetail" resultType="com.op.quality.domain.QcStaticTable">
+		select qctd.project_id projectId,
+		       qctd.status,
+		       SUBSTRING(CONVERT(varchar(18),qctd.create_time, 120), 12, 5),
+			   concat(qctd.project_id,
+					  case when '09:00'>= SUBSTRING(CONVERT(varchar(18),qctd.create_time, 120), 12, 5) and SUBSTRING(CONVERT(varchar(18),qctd.create_time, 120), 12, 5)> '08:00' then '08'
+						   when '10:00'>= SUBSTRING(CONVERT(varchar(18),qctd.create_time, 120), 12, 5) and SUBSTRING(CONVERT(varchar(18),qctd.create_time, 120), 12, 5)> '09:00' then '09'
+						   when '11:00'>= SUBSTRING(CONVERT(varchar(18),qctd.create_time, 120), 12, 5) and SUBSTRING(CONVERT(varchar(18),qctd.create_time, 120), 12, 5)> '10:00' then '10'
+						   when '12:00'>= SUBSTRING(CONVERT(varchar(18),qctd.create_time, 120), 12, 5) and SUBSTRING(CONVERT(varchar(18),qctd.create_time, 120), 12, 5)> '11:00' then '11'
+						   when '13:30'>= SUBSTRING(CONVERT(varchar(18),qctd.create_time, 120), 12, 5) and SUBSTRING(CONVERT(varchar(18),qctd.create_time, 120), 12, 5)> '12:30' then '12'
+						   when '14:30'>= SUBSTRING(CONVERT(varchar(18),qctd.create_time, 120), 12, 5) and SUBSTRING(CONVERT(varchar(18),qctd.create_time, 120), 12, 5)> '13:30' then '13'
+						   when '15:30'>= SUBSTRING(CONVERT(varchar(18),qctd.create_time, 120), 12, 5) and SUBSTRING(CONVERT(varchar(18),qctd.create_time, 120), 12, 5)> '14:30' then '14'
+						   when '16:30'>= SUBSTRING(CONVERT(varchar(18),qctd.create_time, 120), 12, 5) and SUBSTRING(CONVERT(varchar(18),qctd.create_time, 120), 12, 5)> '15:30' then '15'
+						   when '17:30'>= SUBSTRING(CONVERT(varchar(18),qctd.create_time, 120), 12, 5) and SUBSTRING(CONVERT(varchar(18),qctd.create_time, 120), 12, 5)> '16:30' then '16'
+						   when '19:00'>= SUBSTRING(CONVERT(varchar(18),qctd.create_time, 120), 12, 5) and SUBSTRING(CONVERT(varchar(18),qctd.create_time, 120), 12, 5)> '18:00' then '18'
+						   when '20:00'>= SUBSTRING(CONVERT(varchar(18),qctd.create_time, 120), 12, 5) and SUBSTRING(CONVERT(varchar(18),qctd.create_time, 120), 12, 5)> '19:00' then '19'
+						   when '21:00'>= SUBSTRING(CONVERT(varchar(18),qctd.create_time, 120), 12, 5) and SUBSTRING(CONVERT(varchar(18),qctd.create_time, 120), 12, 5)> '20:00' then '20'
+						   else '-' end
+				   )ymdms
+		from qc_check_task qct
+				 left join qc_check_task_detail qctd on qct.record_id = qctd.belong_to
+		where qct.income_batch_no = #{incomeBatchNo} and qct.check_type = 'checkTypeSCXJ'
+		order by qctd.create_time
+
+	</select>
 </mapper>

op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java

@@ -95,8 +95,10 @@ public WmsToWCSDTO packingMaterialsOutBoundCompleted(@RequestBody WmsToWCSDTO wc
 
     @PostMapping("/PurchaseOrderdeliPda")
     public AjaxResult PurchaseOrderdeliPda(@RequestBody OdsProcureOrder odsProcureOrder) {
-        int	tem =odsProcureOrderService.PurchaseOrderdeliPda(odsProcureOrder);
-        return success(tem);
+        odsProcureOrderService.PurchaseOrderdeliPdas(odsProcureOrder);
+        return success();
+//        int  tem =odsProcureOrderService.PurchaseOrderdeliPda(odsProcureOrder);
+//        return success(tem);
     }
 
     /**