From dfff674331a8f783e5ceffdca226017d3ebf1d9c Mon Sep 17 00:00:00 2001 From: FCD <2453864257@qq.com> Date: Fri, 27 Jun 2025 11:11:27 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E7=95=99=E6=A0=B7=E6=A3=80=E9=AA=8C?= =?UTF-8?q?=E8=B0=83=E6=95=B4(=E9=A6=96=E6=A3=80=E5=90=8E=E7=94=9F?= =?UTF-8?q?=E6=88=90=E7=95=99=E6=A0=B7=E4=BB=BB=E5=8A=A1)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../op/quality/domain/QcCheckSampleTask.java | 11 ++++++ .../mapper/QcCheckSampleTaskMapper.java | 12 +++++++ .../impl/QcCheckTaskIncomeServiceImpl.java | 33 ++++++++++++++++++ .../quality/QcCheckSampleTaskMapper.xml | 34 ++++++++++++++++--- 4 files changed, 86 insertions(+), 4 deletions(-) diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckSampleTask.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckSampleTask.java index 0243a9dd9..c4f290d7b 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckSampleTask.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckSampleTask.java @@ -91,6 +91,9 @@ public class QcCheckSampleTask extends BaseEntity { @Excel(name = "第三次检验时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private String thirdCheckTime; + /** 订单号 **/ + private String orderNo; + public String getId() { return id; } @@ -242,4 +245,12 @@ public class QcCheckSampleTask extends BaseEntity { public void setThirdCheckTime(String thirdCheckTime) { this.thirdCheckTime = thirdCheckTime; } + + public String getOrderNo() { + return orderNo; + } + + public void setOrderNo(String orderNo) { + this.orderNo = orderNo; + } } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckSampleTaskMapper.java b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckSampleTaskMapper.java index b72f487cc..3fca5571f 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckSampleTaskMapper.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckSampleTaskMapper.java @@ -46,4 +46,16 @@ public interface QcCheckSampleTaskMapper { * **/ int batchInsertQcCheckSampleTask(List list); + + + /** + * 批量插入留样检验列表 + * **/ + int insertQcCheckSampleTask(QcCheckSampleTask params); + + + /** + * + * **/ + QcCheckSampleTask selectQcCheckSampleTask(QcCheckSampleTask params); } 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 8e026e27d..c53d9b098 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 @@ -99,6 +99,9 @@ public class QcCheckTaskIncomeServiceImpl implements @Autowired private QcCheckTaskUserMapper qcCheckTaskUserMapper; + @Autowired + private QcCheckSampleTaskMapper qcCheckSampleTaskMapper; + private static Pattern p2= Pattern.compile("<[^>]+>"); /** @@ -1178,6 +1181,36 @@ public class QcCheckTaskIncomeServiceImpl implements //发送企业微信 this.sendWX(qcCheckTaskIncome); } + + //首检后新增留样检验任务 + //判断是否是首检 + if("checkTypeSC".equals(qcCheckTaskIncome.getCheckType())){ + QcCheckSampleTask sampleTask = new QcCheckSampleTask(); + sampleTask.setId(IdUtils.fastSimpleUUID()); + sampleTask.setMaterialName(qcCheckTaskIncome.getMaterialName()); + //来料编码 + String incomeBatchNo = qcCheckTaskIncome.getIncomeBatchNo(); + if (StringUtils.isNotBlank(incomeBatchNo)) { + if (incomeBatchNo.length() == 24){ + //国内物料去掉前面时间 + incomeBatchNo = incomeBatchNo.substring(9,24); + } else if (incomeBatchNo.length() < 24){ + //海外物料取创建时间 + incomeBatchNo = DateUtils.parseDateToStr(DateUtils.YYYYMMDD,qcCheckTaskIncome.getCreateTime()); + } + } + + sampleTask.setIncomeBatchNo(incomeBatchNo); + sampleTask.setOrderNo(qcCheckTaskIncome.getOrderNo()); + sampleTask.setCreateTime(qcCheckTaskIncome.getCreateTime()); + //查询该物料是否留样 + QcCheckSampleTask temp = qcCheckSampleTaskMapper.selectQcCheckSampleTask(sampleTask); + //未留样则进行留样 + if(Objects.isNull(temp)){ + qcCheckSampleTaskMapper.insertQcCheckSampleTask(sampleTask); + } + } + return 1 ; } diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckSampleTaskMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckSampleTaskMapper.xml index eb863e8fb..c4193d6da 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckSampleTaskMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckSampleTaskMapper.xml @@ -35,7 +35,7 @@ id, material_name, income_batch_no, - work_order_code_sap, + SUBSTRING ( pow.workorder_code_sap, 4, 12 ) AS work_order_code_sap, sample_time, sample_num, sample_address, @@ -51,7 +51,8 @@ third_check_user_name, third_check_result, third_check_time - from qc_check_sample_task + from qc_check_sample_task task + left join pro_order_workorder pow ON pow.workorder_code = task.order_no and CONVERT(VARCHAR(10), create_time ,23) #{queryDate} @@ -66,10 +67,10 @@ and material_name like concat('%', #{materialName}, '%') - and work_order_code_sap #{workOrderCodeSap} + and SUBSTRING ( pow.workorder_code_sap, 4, 12 ) #{workOrderCodeSap} - order by sample_time desc,create_time desc + order by sample_time desc,task.create_time desc @@ -231,4 +232,29 @@ + + INSERT INTO qc_check_sample_task ( + id, + material_name, + income_batch_no, + order_no, + create_time + ) + VALUES + ( + #{id}, + #{materialName}, + #{incomeBatchNo}, + #{orderNo}, + #{createTime} + ) + + + + + \ No newline at end of file From 394a85fc630d6db58554c1fd1709aa0590194d73 Mon Sep 17 00:00:00 2001 From: FCD <2453864257@qq.com> Date: Thu, 3 Jul 2025 15:39:38 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E6=88=90=E5=93=81=E4=BA=A7=E9=87=8F?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=EF=BC=9A=E6=96=B0=E5=A2=9E=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E5=8F=B7=E3=80=81=E6=89=B9=E6=AC=A1=E4=BF=A1=E6=81=AF=EF=BC=9B?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9F=A5=E8=AF=A2=E6=8A=A5=E9=94=99;?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../op/mes/domain/MesReportProduction.java | 23 +++++++++++++++++++ .../mapper/mes/MesReportWorkMapper.xml | 7 +++++- 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportProduction.java b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportProduction.java index fa4031229..c15da822b 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportProduction.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportProduction.java @@ -31,6 +31,13 @@ public class MesReportProduction extends BaseEntity { private String machineName; @Excel(name = "订单编号") private String orderCode; + + @Excel(name = "工单号") + private String workorderCode; + + @Excel(name = "批次号") + private String batch; + @Excel(name = "产品编码") private String productCode; @Excel(name = "产品名称") @@ -183,4 +190,20 @@ public class MesReportProduction extends BaseEntity { public void setProductDateEnd(String productDateEnd) { this.productDateEnd = productDateEnd; } + + public String getWorkorderCode() { + return workorderCode; + } + + public void setWorkorderCode(String workorderCode) { + this.workorderCode = workorderCode; + } + + public String getBatch() { + return batch; + } + + public void setBatch(String batch) { + this.batch = batch; + } } diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml index a9b93f9bc..ca5207f43 100644 --- a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml +++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml @@ -203,6 +203,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" sf1.factory_name carName, sf.equipment_code machineCode, sf.equipment_name machineName, + mrw.workorder_code workorderCode, + mrw.batch batch, mrw.product_code productCode, mrw.product_name productName, mrw.quantity, @@ -214,8 +216,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join sys_factory sf1 on sf.workshop_code = sf1.factory_code left join sys_factory sf2 on sf1.parent_id = sf2.factory_id where mrw.parent_order = '0' and mrw.del_flag = '0' - and sf.factory_name like concat('%', #{machineName}, '%') + and sf.equipment_name like concat('%', #{machineName}, '%') and sf1.factory_name like concat('%', #{carName}, '%') + and mrw.workorder_code like concat('%', #{workorderCode}, '%') + and mrw.batch like concat('%', #{batch}, '%') and sf2.factory_name like concat('%', #{factoryName}, '%') and pow.product_code like concat('%', #{productCode}, '%') @@ -224,6 +228,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and CONVERT(varchar(10),mrw.feedback_time, 120) >= #{productDateStart} and #{productDateEnd} >= CONVERT(varchar(10),mrw.feedback_time, 120) + ORDER BY sf.equipment_name @@ -661,4 +665,41 @@ ORDER BY wms_raw_order_in.gmt_create DESC + + + From d960978079d97452b906b575f3f50a6e095e0cea Mon Sep 17 00:00:00 2001 From: FCD <2453864257@qq.com> Date: Thu, 3 Jul 2025 15:53:42 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E5=8C=85=E6=9D=90=E9=80=80=E8=B4=A7?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8E=92=E5=BA=8F=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/op/wms/domain/OdsProcureOutOrder.java | 13 +++++++++++++ .../mapper/wms/OdsProcureOutOrderMapper.xml | 2 ++ 2 files changed, 15 insertions(+) diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/OdsProcureOutOrder.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/OdsProcureOutOrder.java index 6c5710b43..e95084351 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/domain/OdsProcureOutOrder.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/domain/OdsProcureOutOrder.java @@ -416,6 +416,11 @@ public class OdsProcureOutOrder extends BaseEntity { private String waCode; private String wlCode; + /** + * 序号 + * **/ + private String sort; + public String getWhCode() { return whCode; } @@ -728,6 +733,14 @@ public class OdsProcureOutOrder extends BaseEntity { return enterpriseCode; } + public String getSort() { + return sort; + } + + public void setSort(String sort) { + this.sort = sort; + } + @Override public String toString() { return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml index 094fa33e1..323bc8a7c 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml @@ -44,6 +44,7 @@ + limit #{page.pageOffset} , #{page.rows} @@ -1406,6 +1407,7 @@