From 9a559f022a4f1c541e7848a6792157fd334b8759 Mon Sep 17 00:00:00 2001 From: A0010407 Date: Tue, 27 Aug 2024 14:02:01 +0800 Subject: [PATCH 1/4] =?UTF-8?q?2024-08-27=20=E8=AE=A1=E5=88=92-=E4=BA=A7?= =?UTF-8?q?=E5=93=81=E6=A0=87=E8=AF=86=E5=8D=A1-=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=EF=BC=88=E4=BA=8C=E7=BB=B4=E7=A0=81=E7=94=9F=E6=88=90=E9=94=99?= =?UTF-8?q?=E8=AF=AF=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java index 3790df4f4..6d5f23090 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java @@ -1315,7 +1315,7 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService { List dtos1 = proOrderWorkorderMapper.getPreIdCardList(proOrderWorkorder); ProOrderWorkorder pow = dtos1.get(0); proOrderWorkorder.setPalletNo(palletNo); - String uniqueBarCode = pow.getProductCode().replace("0000000","") + + String uniqueBarCode = pow.getProductCode().replace("0000000","") + "-" + pow.getWorkorderCode() + "-" + proOrderWorkorder.getBatchCode() + "-" + palletNo;//订单号+批次+板次 唯一二维码标识 ProOrderWorkorder pw = new ProOrderWorkorder(); pw.setProductName(pow.getProductName());//产品名 From d4e50bba1c22ef072f2089d3daef07ea543983b7 Mon Sep 17 00:00:00 2001 From: Yangwl <1726150332@qq.com> Date: Tue, 27 Aug 2024 15:47:42 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=AE=A1=E4=BB=B6=E5=B7=A5=E8=B5=84?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/op/mes/domain/MesUnitpriceReport.java | 7 +++++-- .../resources/mapper/mes/MesUnitpriceReportMapper.xml | 9 +++++---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/op-modules/op-mes/src/main/java/com/op/mes/domain/MesUnitpriceReport.java b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesUnitpriceReport.java index abd136338..b91cc67db 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/domain/MesUnitpriceReport.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesUnitpriceReport.java @@ -54,6 +54,9 @@ public class MesUnitpriceReport extends BaseEntity { @Excel(name = "产品名称") private String productName; + @Excel(name = "带线组长") + private String lineLeader; + // @Excel(name = "产线编码") // private String sapCode; @@ -78,6 +81,8 @@ public class MesUnitpriceReport extends BaseEntity { @Excel(name = "岗位") private String post; + @Excel(name = "工时") + private String attr2; /** * 子工序名称 */ @@ -110,8 +115,6 @@ public class MesUnitpriceReport extends BaseEntity { @Excel(name = " 计件薪酬（元）") private BigDecimal result; - @Excel(name = "工时") - private String attr2; @Excel(name = "扣款") private BigDecimal kk; diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesUnitpriceReportMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesUnitpriceReportMapper.xml index 58b2e4ad9..e463ab550 100644 --- a/op-modules/op-mes/src/main/resources/mapper/mes/MesUnitpriceReportMapper.xml +++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesUnitpriceReportMapper.xml @@ -27,7 +27,7 @@ - + @@ -95,7 +95,8 @@ CAST (mup.attr1 AS DECIMAL(18, 6)) AS attr1, ROUND(mup.attr1 * mur.attr1, 2) AS result, - mur.create_time + mur.create_time, + mur.create_by FROM mes_unitprice_report mur LEFT JOIN mes_unit_price mup ON RIGHT ( mur.product_code, 11 ) = mup.product_code @@ -168,8 +169,8 @@ mur.sj, mur.tsfy, mur.ybbt, - mur.xcbt - + mur.xcbt, + mur.create_by + + diff --git a/op-modules/op-system/src/main/resources/mapper/system/SysUserMapper.xml b/op-modules/op-system/src/main/resources/mapper/system/SysUserMapper.xml index 6b316b1a5..5ca38953c 100644 --- a/op-modules/op-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/op-modules/op-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -81,10 +81,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND u.phonenumber like concat('%', #{phonenumber}, '%') - AND date_format(u.create_time,'%y%m%d') >= date_format(#{params.beginTime},'%y%m%d') + and CONVERT(varchar(30),u.create_time, 120) >= CONVERT(varchar(30),#{params.beginTime}, 120) - AND date_format(u.create_time,'%y%m%d') <= date_format(#{params.endTime},'%y%m%d') + and CONVERT(varchar(30),u.create_time, 120) <= CONVERT(varchar(30),#{params.endTime}, 120) AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t From b3cfa58a3dc8ecf898715bb8d7716df7fc02c7e3 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Tue, 27 Aug 2024 17:46:24 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E5=AF=BC=E5=87=BA2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/op/quality/domain/QcCheckDetail.java | 2 +- .../resources/mapper/quality/QcStaticTableMapper.xml | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckDetail.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckDetail.java index 341ef0b80..cb4a66448 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckDetail.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckDetail.java @@ -27,7 +27,7 @@ public class QcCheckDetail extends BaseEntity { private String materialCode; @Excel(name = "产品名称") private String materialName; - @Excel(name = "检验结果",readConverterExp = "Y=合格,1=不合格") + @Excel(name = "检验结果",readConverterExp = "Y=合格,N=不合格") private String checkResult; @Excel(name = "缺陷描述") private String className; 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 ca175a6b1..60c3557ba 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 @@ -826,20 +826,23 @@ qct.income_time incomeTime, qct.order_no orderNo, qct.check_result checkResult, - qct.supplier_code supplierCode, - qct.supplier_name supplierName, + pow.workorder_name supplierCode, + be.equipment_name supplierName, qct.material_code materialCode, qct.material_name materialName, qdtc.id classCode, qdtc.class_name className from qc_check_task qct + left join pro_order_workorder pow on pow.workorder_code = qct.order_no + left join base_equipment be on be.equipment_code = pow.workorder_name left join qc_check_task_defect qctd on qctd.belong_to = qct.record_id left join qc_defect_type_class qdtc on qctd.class_id = qdtc.id where qct.check_type = #{checkType} and qct.check_status = '2' and CONVERT(varchar(4),qct.create_time, 120) = #{incomeTimeStr} and CONVERT(varchar(7),qct.create_time, 120) = #{incomeTimeStr} and CONVERT(varchar(10),qct.create_time, 120) = #{incomeTimeStr} - and qct.del_flag = '0' and qdtc.del_flag = '0' and qctd.del_flag = '0' + and qct.del_flag = '0' and qdtc.del_flag = '0' and qctd.del_flag = '0' and pow.del_flag = '0' + and be.del_flag = '0' order by qct.order_no,qct.income_time