From 55fc30ed133c2777fe387f82eee46161e9b1b7bb Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Wed, 10 Jan 2024 15:30:09 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../op/quality/domain/QcCheckTaskIncome.java | 10 ++++- .../impl/QcCheckTaskIncomeServiceImpl.java | 40 ++++++++++++++++--- .../impl/QcCheckTaskUserServiceImpl.java | 18 ++++++--- .../mapper/quality/QcProCheckMapper.xml | 5 ++- .../mapper/quality/QcStaticTableMapper.xml | 2 +- 5 files changed, 62 insertions(+), 13 deletions(-) diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskIncome.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskIncome.java index 148dc24a..68ea7c24 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskIncome.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskIncome.java @@ -27,7 +27,7 @@ public class QcCheckTaskIncome extends BaseEntity { private String checkNo; private String workorderCode; - + private String workorderCodeSap; /** 来料批次号 */ @Excel(name = "批次号") private String incomeBatchNo; @@ -139,6 +139,14 @@ public class QcCheckTaskIncome extends BaseEntity { private String fileList; + public String getWorkorderCodeSap() { + return workorderCodeSap; + } + + public void setWorkorderCodeSap(String workorderCodeSap) { + this.workorderCodeSap = workorderCodeSap; + } + public String getFileList() { return fileList; } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java index 507d212b..489f5488 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java @@ -163,6 +163,8 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService { qcCheckTaskUser.setCheckManCode(splitCodes[i]); qcCheckTaskUser.setCheckNo(qcCheckTaskIncome.getCheckNo()); qcCheckTaskUser.setBelongTo(beLongId); + qcCheckTaskUser.setFactoryCode(factoryCode); + qcCheckTaskUserList.add(qcCheckTaskUser); } //检验人插入 @@ -407,14 +409,14 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService { return n ; } - + //来料检验不良OA流程 private AjaxResult createLLOA(QcCheckTaskIncome qcCheckTaskIncome){ //发起来料检验OA流程 Map paramMap = new HashMap<>(); paramMap.put("user","999999");//提交人工号qcCheckTaskIncome.getUpdateBy() paramMap.put("requestLevel",0);//流程紧急度 - paramMap.put("requestName","ZL0010-来料检验不合格审批流程(订单:"+qcCheckTaskIncome.getOrderNo()+")");//流程名称 - paramMap.put("workflowId",26258);//该流程对应的唯- workFlowld + paramMap.put("requestName","ZL0020-来料检验不合格审批流程(订单:"+qcCheckTaskIncome.getOrderNo()+")");//流程名称 + paramMap.put("workflowId",26234);//该流程对应的唯- workFlowld StringBuffer mainObject = new StringBuffer(); mainObject.append("{"); @@ -429,13 +431,41 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService { //mainObject.append(",\"memo\":"+"\""+qcCheckTaskIncome.getQuality0()+"\"");//不合格情况描述 mainObject.append("}"); + paramMap.put("mainObject",mainObject.toString()); + logger.info("流程Id 26234:"+ JSONObject.toJSONString(paramMap)); + AjaxResult oaR = remoteOpenService.OAInspection(paramMap); + logger.info("流程Id 26234:"+ JSONObject.toJSONString(oaR)); + return oaR; + } + /*生产过程不良OA流程 + * PGBCJ 申请部门/SSCJ 所属车间/ZRPSN报检人/GJZ关键字/SCLX生产类型/OEM OEM厂名/DH 单号/DW单位/MEMO01 不合格描述/ + * MEMO03 备注/SFXZG 是否需要QC主管审核/PGZG QC主管 + * PGZRJL 品管主任*/ + private AjaxResult createProduceOA(QcCheckTaskIncome qcCheckTaskIncome){ + //发起来料检验OA流程 + Map paramMap = new HashMap<>(); + paramMap.put("user","999999");//提交人工号qcCheckTaskIncome.getUpdateBy() + paramMap.put("requestLevel",0);//流程紧急度 + paramMap.put("requestName","ZL0010-成品检验控制流程(订单:"+qcCheckTaskIncome.getOrderNo()+")");//流程名称 + paramMap.put("workflowId",26258);//该流程对应的唯- workFlowld + + StringBuffer mainObject = new StringBuffer(); + mainObject.append("{"); + mainObject.append("\"SSCJ\":"+qcCheckTaskIncome.getFactoryCode());//所属车间 + mainObject.append(",\"ZRPSN\":"+"\""+qcCheckTaskIncome.getUpdateBy()+"\"");//报检人 + mainObject.append(",\"OEM\":"+"\""+qcCheckTaskIncome.getFactoryCode()+"\"");//OEM厂名 + mainObject.append(",\"DH\":"+"\""+qcCheckTaskIncome+"\"");//单号 + mainObject.append(",\"MEMO01\":"+"\""+qcCheckTaskIncome.getSupplierName()+"\"");//不合格情况描述 + mainObject.append("}"); + + + paramMap.put("mainObject",mainObject.toString()); logger.info("流程Id 26258:"+ JSONObject.toJSONString(paramMap)); AjaxResult oaR = remoteOpenService.OAInspection(paramMap); logger.info("流程Id 26258:"+ JSONObject.toJSONString(oaR)); return oaR; } - @Override @DS("#header.poolName") public List getDefectList(QcDefectType qcDefectType) { @@ -597,7 +627,7 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService { if("material".equals(qcCheckTaskIncome.getTypeCode())) { oaR = this.createLLOA(qcCheckTaskIncome); }else if("produce".equals(qcCheckTaskIncome.getTypeCode())){ - + oaR = this.createProduceOA(qcCheckTaskIncome); }else if("product".equals(qcCheckTaskIncome.getTypeCode())) { } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskUserServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskUserServiceImpl.java index ef37013c..fa4aceeb 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskUserServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskUserServiceImpl.java @@ -4,6 +4,7 @@ import java.util.Date; import java.util.List; 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; @@ -70,7 +71,7 @@ public class QcCheckTaskUserServiceImpl implements IQcCheckTaskUserService { /** * 修改来料检验任务--检查人 * - * @param qcCheckTaskUser 来料检验任务--检查人 + * @param qcCheckTaskUserList 来料检验任务--检查人 * @return 结果 */ @Override @@ -134,10 +135,17 @@ public class QcCheckTaskUserServiceImpl implements IQcCheckTaskUserService { if (CollectionUtils.isEmpty(qcCheckTaskUserList)){ return 0; } - //获取当前所选工厂 - HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); - String key = "#header.poolName"; - String factoryCode = request.getHeader(key.substring(8)).replace("ds_", ""); + String factoryCode = ""; + if(StringUtils.isNotBlank(qcCheckTaskUserList.get(0).getFactoryCode())){ + DynamicDataSourceContextHolder.push("ds_"+qcCheckTaskUserList.get(0).getFactoryCode()); + factoryCode= qcCheckTaskUserList.get(0).getFactoryCode(); + }else{ + //获取当前所选工厂 + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + String key = "#header.poolName"; + factoryCode = request.getHeader(key.substring(8)).replace("ds_",""); + } + //遍历赋值 Date nowTime = DateUtils.getNowDate(); for (QcCheckTaskUser qcCheckTaskUser : qcCheckTaskUserList){ diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcProCheckMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcProCheckMapper.xml index de5b8fa8..db99de73 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcProCheckMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcProCheckMapper.xml @@ -66,6 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -255,10 +256,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" qct.check_status, qct.check_man_code,qct.check_man_name, qct.check_time, qct.check_result, qct.status,qct.create_by,qct.create_time,qct.check_type, qct.noOk_quality,qct.aNoOkquality,qct.bNoOkquality,qct.cNoOkquality,qct.sample_quality + ,pow.workorder_code_sap workorderCodeSap from qc_check_task qct left join qc_check_task_user qctu on qctu.belong_to = qct.record_id + left join pro_order_workorder pow on pow.workorder_code = qct.order_no - and qct.del_flag = '0' + and qct.del_flag = '0' and pow.del_flag = '0' and qct.check_type = #{checkType} and qctu.check_man_code = #{checkManCode} and qct.check_status in (${checkStatus}) diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml index 6379bb68..69a6791b 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml @@ -150,7 +150,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" )ymdms from qc_check_task qct left join qc_check_task_detail qctd on qct.record_id = qctd.belong_to - where qct.order_no = #{orderNo} and qct.check_type = 'checkTypeSCXJ' + where qct.order_no = #{orderNo} and qct.check_type = 'checkTypeSCXJ' and qct.check_status = '2' order by qctd.create_time From 58d80d29c8ea733204f49309a14cdb938e59288a Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Wed, 10 Jan 2024 16:23:02 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/QcCheckUnqualifiedMapper.java | 2 ++ .../service/IQcCheckTaskUserService.java | 16 ++++++----- .../impl/QcCheckTaskIncomeServiceImpl.java | 6 +++-- .../impl/QcCheckTaskUserServiceImpl.java | 27 +++++++++++-------- .../quality/QcCheckUnqualifiedMapper.xml | 26 +++++++++++------- 5 files changed, 47 insertions(+), 30 deletions(-) diff --git a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckUnqualifiedMapper.java b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckUnqualifiedMapper.java index f7dfde3c..6a1951e7 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckUnqualifiedMapper.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckUnqualifiedMapper.java @@ -82,4 +82,6 @@ public interface QcCheckUnqualifiedMapper { int updateWorkOrderBatchStatus(QcCheckTaskIncome qcCheckTaskIncome); List getProductWorkOrder(QcCheckTaskIncome qcCheckTaskIncome); + + void updatePutStatus(QcCheckTaskIncome qcCheckTaskIncome); } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskUserService.java b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskUserService.java index c588ab9f..fe6f5b37 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskUserService.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskUserService.java @@ -5,14 +5,14 @@ import com.op.quality.domain.QcCheckTaskUser; /** * 来料检验任务--检查人Service接口 - * + * * @author Open Platform * @date 2023-12-22 */ public interface IQcCheckTaskUserService { /** * 查询来料检验任务--检查人 - * + * * @param recordId 来料检验任务--检查人主键 * @return 来料检验任务--检查人 */ @@ -20,7 +20,7 @@ public interface IQcCheckTaskUserService { /** * 查询来料检验任务--检查人列表 - * + * * @param qcCheckTaskUser 来料检验任务--检查人 * @return 来料检验任务--检查人集合 */ @@ -28,7 +28,7 @@ public interface IQcCheckTaskUserService { /** * 新增来料检验任务--检查人 - * + * * @param qcCheckTaskUser 来料检验任务--检查人 * @return 结果 */ @@ -36,7 +36,7 @@ public interface IQcCheckTaskUserService { /** * 修改来料检验任务--检查人 - * + * * @param qcCheckTaskUser 来料检验任务--检查人 * @return 结果 */ @@ -44,7 +44,7 @@ public interface IQcCheckTaskUserService { /** * 批量删除来料检验任务--检查人 - * + * * @param recordIds 需要删除的来料检验任务--检查人主键集合 * @return 结果 */ @@ -54,7 +54,7 @@ public interface IQcCheckTaskUserService { /** * 删除来料检验任务--检查人信息 - * + * * @param recordId 来料检验任务--检查人主键 * @return 结果 */ @@ -68,4 +68,6 @@ public interface IQcCheckTaskUserService { * 根据任务编号查询检验人 */ public QcCheckTaskUser selectQcCheckTaskUserByBelongTo(String belongTo); + + public int insertQcCheckTaskUserPDA(List qcCheckTaskUserList); } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java index 489f5488..cdaf2031 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java @@ -168,7 +168,7 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService { qcCheckTaskUserList.add(qcCheckTaskUser); } //检验人插入 - qcCheckTaskUserService.insertQcCheckTaskUserList(qcCheckTaskUserList); + qcCheckTaskUserService.insertQcCheckTaskUserPDA(qcCheckTaskUserList); }else{//上位机触发 qcCheckTaskIncome.setCheckManName(""); qcCheckTaskIncome.setCheckManCode(""); @@ -608,7 +608,9 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService { qcCheckTaskIncome.setStatus("2"); qcCheckUnqualifiedMapper.updateWorkOrderBatchStatus(qcCheckTaskIncome); }else if("product".equals(qcCheckTaskIncome.getTypeCode())){ - + /**wms_product_put-->check_status->1**/ + qcCheckTaskIncome.setStatus("2"); + qcCheckUnqualifiedMapper.updatePutStatus(qcCheckTaskIncome); } //不合格处理 diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskUserServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskUserServiceImpl.java index fa4aceeb..ab5007f8 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskUserServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskUserServiceImpl.java @@ -132,20 +132,23 @@ public class QcCheckTaskUserServiceImpl implements IQcCheckTaskUserService { @Override @DS("#header.poolName") public int insertQcCheckTaskUserList(List qcCheckTaskUserList) { + //获取当前所选工厂 + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + String key = "#header.poolName"; + String factoryCode = request.getHeader(key.substring(8)).replace("ds_",""); + return this.insertTaskUsers(qcCheckTaskUserList,factoryCode); + } + @Override + public int insertQcCheckTaskUserPDA(List qcCheckTaskUserList) { + DynamicDataSourceContextHolder.push("ds_"+qcCheckTaskUserList.get(0).getFactoryCode()); + String factoryCode= qcCheckTaskUserList.get(0).getFactoryCode(); + return this.insertTaskUsers(qcCheckTaskUserList,factoryCode); + } + + private int insertTaskUsers(List qcCheckTaskUserList,String factoryCode){ if (CollectionUtils.isEmpty(qcCheckTaskUserList)){ return 0; } - String factoryCode = ""; - if(StringUtils.isNotBlank(qcCheckTaskUserList.get(0).getFactoryCode())){ - DynamicDataSourceContextHolder.push("ds_"+qcCheckTaskUserList.get(0).getFactoryCode()); - factoryCode= qcCheckTaskUserList.get(0).getFactoryCode(); - }else{ - //获取当前所选工厂 - HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); - String key = "#header.poolName"; - factoryCode = request.getHeader(key.substring(8)).replace("ds_",""); - } - //遍历赋值 Date nowTime = DateUtils.getNowDate(); for (QcCheckTaskUser qcCheckTaskUser : qcCheckTaskUserList){ @@ -162,4 +165,6 @@ public class QcCheckTaskUserServiceImpl implements IQcCheckTaskUserService { public QcCheckTaskUser selectQcCheckTaskUserByBelongTo(String belongTo) { return qcCheckTaskUserMapper.selectQcCheckTaskUserByBelongTo(belongTo); } + + } diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckUnqualifiedMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckUnqualifiedMapper.xml index cba98ba8..87af0c7e 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckUnqualifiedMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckUnqualifiedMapper.xml @@ -118,17 +118,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by product_date desc @@ -203,6 +206,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update pro_order_workorder_batch set qc_status = #{status} where batch_code = #{incomeBatchNo} + + update wms_product_put set check_status = #{status} where batch_number = #{incomeBatchNo} + delete from qc_check_unqualified where id = #{id} From 6f1d92edd5ce3a5acaf528cbc18c7843bbc9c71e Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Wed, 10 Jan 2024 16:45:30 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/QcCheckTaskWarehousingServiceImpl.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskWarehousingServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskWarehousingServiceImpl.java index 6321509c..2d329cc2 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskWarehousingServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskWarehousingServiceImpl.java @@ -150,7 +150,7 @@ public class QcCheckTaskWarehousingServiceImpl implements IQcCheckTaskWarehousin qcCheckTaskUserList.add(qcCheckTaskUser); } //检验人插入 - qcCheckTaskUserService.insertQcCheckTaskUserList(qcCheckTaskUserList); + qcCheckTaskUserService.insertQcCheckTaskUserPDA(qcCheckTaskUserList); }else{//上位机触发 qcCheckTaskWarehousing.setCheckManName(""); qcCheckTaskWarehousing.setCheckManCode(""); @@ -250,5 +250,4 @@ public class QcCheckTaskWarehousingServiceImpl implements IQcCheckTaskWarehousin return qcCheckTaskWarehousingMapper.getQcListLoc(qcCheckTaskWarehousing); } - }