From 03df078310b88f2b4472c07ed9a09278b425ee00 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期二, 16 七月 2024 17:28:34 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java | 7 ++-----
north-glass-erp/northglass-erp/src/views/pp/reportingWorks/QualityInspectionReview.vue | 2 +-
north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi2.vue | 12 +++++++-----
north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue | 12 ++++++++----
north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml | 2 +-
north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue | 1 +
north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportingWorkMapper.java | 3 +--
north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml | 3 ++-
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml | 2 +-
9 files changed, 24 insertions(+), 20 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue
index 02ee91d..39783f8 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue
@@ -84,12 +84,13 @@
orderOtherMoney.value.forEach(item => {
let column = {
field: `${item.column}`,
- width: 60,
+ width: 85,
title: item.alias,
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged,
}
- //columns.push(column)
- console.log(column)
gridOptions.columns.push(column)
})
@@ -202,7 +203,10 @@
{field: 'computeGrossArea', title: t('processCard.areaToDivided'), width: '80px'},
{field: 'totalThickness', title: t('processCard.totalThickness'), width: '80px'},
{field: 'thickness', title: t('processCard.glassThickness'), width: '80px'},
- {field: 'weight', title: t('processCard.weight'), slots: {default: 'weight_sum'}, width: '85px'}
+ {field: 'weight', title: t('processCard.weight'), slots: {default: 'weight_sum'}, width: '85px'},
+ {field: 'remarks', title: t('processCard.notes'), width: '85px',filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged}
],//琛ㄥご鎸夐挳
toolbarConfig: {
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi2.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi2.vue
index e451cc0..e0d845b 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi2.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi2.vue
@@ -140,25 +140,26 @@
display: flex;
justify-content: left;
flex-wrap: wrap;
- margin-left: 5px;
+ width: 400px;
}
#entirety{
text-align: center;
width: 50%;
- height: 105px;
+ height: 150px;
+ border: black 1px;
}
.row1 {
font-size: 12pt;
font-weight: bold;
- height: 25px;
+ height: 35px;
}
.row2 {
font-size: 12pt;
font-weight: bold;
- height: 25px;
+ height: 30px;
}
span {
font-size: 12pt;
@@ -170,10 +171,11 @@
height: 30px;
font-size: 20pt;
font-weight: bolder;
+ line-height: 30px;
}
.row5 {
- height: 25px;
+ height: 40px;
font-weight: bold;
font-size: 12pt;
}
diff --git a/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue b/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue
index dccbd2b..e479651 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue
@@ -815,6 +815,7 @@
}
const saveReportingWorkRequest = (requestData) =>{
+ //request.post(`/reportingWork/saveReportingWorkLog`, requestData)
request.post(`/reportingWork/saveReportingWork`,requestData).then(res =>{
if (res.code == 200){
ElMessage.success(t('reportingWorks.successfulJobApplication'))
diff --git a/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/QualityInspectionReview.vue b/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/QualityInspectionReview.vue
index eaf8cab..cab1c30 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/QualityInspectionReview.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/QualityInspectionReview.vue
@@ -105,7 +105,7 @@
//鑾峰彇涓冨ぉ鍓嶅埌褰撳墠鏃堕棿
function getNowTime() {
- const start = new Date(new Date().getTime() - 3600 * 1000 * 24 * 3)
+ const start = new Date(new Date().getTime() - 3600 * 1000 * 24 * 7)
.toISOString()
.replace('T', ' ')
.slice(0, 10) //榛樿寮�濮嬫椂闂�7澶╁墠
diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportingWorkMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportingWorkMapper.java
index 7f1f62d..889e8d3 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportingWorkMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportingWorkMapper.java
@@ -2,7 +2,6 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.example.erp.entity.pp.BasicDataProduce;
import com.example.erp.entity.pp.ReportingWork;
-import com.example.erp.entity.sd.OrderGlassDetail;
import org.apache.ibatis.annotations.Mapper;
import java.sql.Date;
@@ -19,7 +18,7 @@
List<BasicDataProduce> SelectWorkBasicTeamsMp(String process);
- String SelectTechnologicalProcess(String processIdStr);
+ String SelectTechnologicalProcess(String processIdStr, String technologyStr);
String SelectWorkTechnologyMp(String processIdStr);
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java
index 1a0b353..bb3fdd9 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java
@@ -5,14 +5,12 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
import com.example.erp.common.Constants;
import com.example.erp.entity.pp.DamageDetails;
import com.example.erp.entity.pp.FlowCard;
import com.example.erp.entity.pp.ReportingWork;
import com.example.erp.entity.pp.ReportingWorkDetail;
import com.example.erp.entity.sd.Order;
-import com.example.erp.entity.sd.OrderDetail;
import com.example.erp.entity.sd.OrderProcessDetail;
import com.example.erp.exception.ServiceException;
import com.example.erp.mapper.pp.*;
@@ -20,7 +18,6 @@
import com.example.erp.mapper.sd.OrderMapper;
import com.example.erp.mapper.sd.OrderProcessDetailMapper;
import com.example.erp.service.sd.OrderProcessDetailService;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -66,7 +63,7 @@
public Map<String, Object> AddSelectLastWorkSv(String processIdStr, String technologyStr, String process) {
Map<String, Object> map = new HashMap<>();
//鏌ヨ娴佺▼鍗″伐鑹烘祦绋�
- String technologicalProcess = reportingWorkMapper.SelectTechnologicalProcess(processIdStr);
+ String technologicalProcess = reportingWorkMapper.SelectTechnologicalProcess(processIdStr,technologyStr);
@@ -203,7 +200,7 @@
});
}
//鏌ヨ娴佺▼鍗″伐鑹烘祦绋�
- String technologicalProcess = reportingWorkMapper.SelectTechnologicalProcess(reportingWork.getProcessId());
+ String technologicalProcess = reportingWorkMapper.SelectTechnologicalProcess(reportingWork.getProcessId(), reportingWorkDetail.getTechnologyNumber());
int index = technologicalProcess.indexOf("-");
String interceptProcess = "";
diff --git a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
index 6079a46..1191627 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -246,7 +246,7 @@
p.total_thickness AS 'totalThickness',
p.thickness,
od.weight,
- od.weight,
+ od.remarks,
ods.S01,
ods.S02,
ods.S03,
diff --git a/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml b/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
index 68ca981..9de2e70 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
@@ -105,6 +105,7 @@
select ogd.process
from sd.order_glass_detail as ogd
where ogd.production_id = LEFT(#{processIdStr}, 11)
+ and ogd.technology_number=#{technologyStr}
limit 1
</select>
@@ -704,7 +705,7 @@
update reporting_work as rw left join damage_details as dd on rw.reporting_work_id = dd.reporting_work_id
set dd.quality_ins_status = 2,
rw.quality_inspector=#{username},
- rw.examine_time=NOW()
+ rw.quality_ins_time=NOW()
where rw.reporting_work_id = #{reportingWorkId}
</update>
diff --git a/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml b/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml
index 3ad6e45..a57e1d9 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml
@@ -10,7 +10,7 @@
from
sd.`order` as o
where
- o.quantity=#{order.quantity} and o.area=#{order.area} and o.project=#{order.project} and o.customer_id=#{order.customerId} and o.money=#{order.money}
+ o.quantity=#{order.quantity} and o.area=#{order.area} and o.project=#{order.project} and o.customer_id=#{order.customerId}
</select>
<select id="selectMaxOrderId">
--
Gitblit v1.8.0