From 10a26b9b670efef0a2adba675c794c539846aa3c Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 06 九月 2024 10:18:10 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue | 5 +
north-glass-erp/northglass-erp/src/lang/zh.js | 1
north-glass-erp/northglass-erp/src/views/pp/Replenish/SelectReplenish.vue | 38 ++++++++-
north-glass-erp/src/main/resources/mapper/pp/PatchLogMapper.xml | 21 +++++
north-glass-erp/src/main/java/com/example/erp/mapper/pp/PatchLogMapper.java | 5 +
north-glass-erp/src/main/java/com/example/erp/service/pp/ReplenishService.java | 80 ++++++++++++++++++-
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml | 1
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java | 4
north-glass-erp/northglass-erp/src/views/RegisterView.vue | 2
north-glass-erp/northglass-erp/src/views/LoginView.vue | 2
north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue | 6 +
north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportingWorkMapper.java | 2
north-glass-erp/src/main/java/com/example/erp/controller/pp/ReplenishController.java | 7 +
north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml | 47 +++++++++++
14 files changed, 205 insertions(+), 16 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/lang/zh.js b/north-glass-erp/northglass-erp/src/lang/zh.js
index eaa5641..0c5e954 100644
--- a/north-glass-erp/northglass-erp/src/lang/zh.js
+++ b/north-glass-erp/northglass-erp/src/lang/zh.js
@@ -87,6 +87,7 @@
deleteSuccess:'鍒犻櫎鎴愬姛',
deleteFail:'鍒犻櫎澶辫触',
cancelReviewFail:'鍙嶅澶辫触',
+ cancelReviewFailWork:'鍙嶅澶辫触,璇锋鏌ユ槸鍚︽姤宸�',
reviewFail:'瀹℃牳澶辫触',
noProductDataInTheTable:'琛ㄦ牸涓棤浜у搧鏁版嵁',
tableDataExceedsMaximumLimit:'琛ㄦ牸鏁版嵁瓒呰繃鏈�澶ч檺鍒�',
diff --git a/north-glass-erp/northglass-erp/src/views/LoginView.vue b/north-glass-erp/northglass-erp/src/views/LoginView.vue
index fb4c6d7..f79117f 100644
--- a/north-glass-erp/northglass-erp/src/views/LoginView.vue
+++ b/north-glass-erp/northglass-erp/src/views/LoginView.vue
@@ -73,6 +73,8 @@
ElMessage.error(t('login.connectErr'))
loginLoadings.value=false
return false
+ }).then(() => {
+ userForm.pass = atob(userForm.pass)
})
}
})
diff --git a/north-glass-erp/northglass-erp/src/views/RegisterView.vue b/north-glass-erp/northglass-erp/src/views/RegisterView.vue
index bded910..30e0d48 100644
--- a/north-glass-erp/northglass-erp/src/views/RegisterView.vue
+++ b/north-glass-erp/northglass-erp/src/views/RegisterView.vue
@@ -97,6 +97,8 @@
ElMessage.error("鏈嶅姟鍣ㄨ繛鎺ュけ璐�")
loginLoadings.value=false
return false
+ }).then(() => {
+ register.password = atob(register.password)
})
}
})
diff --git a/north-glass-erp/northglass-erp/src/views/pp/Replenish/SelectReplenish.vue b/north-glass-erp/northglass-erp/src/views/pp/Replenish/SelectReplenish.vue
index f0410a8..a6e59a3 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/Replenish/SelectReplenish.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/Replenish/SelectReplenish.vue
@@ -69,7 +69,6 @@
gridOptions.loading=false
}else{
ElMessage.warning(res.msg)
- router.push("/login")
}
})
@@ -150,6 +149,10 @@
{
'name': t('basicData.delete'),status: 'primary',
'code':'delete'
+ },
+ {
+ 'name': t('basicData.cancelReview'),status: 'primary',
+ 'code':'cancelReview'
}
],
/*import: false,
@@ -230,7 +233,34 @@
}else{
ElMessage.warning(t('basicData.msg.deleteFail'))
- router.push("/login")
+ }
+ })
+ }
+ return
+
+ }
+ case 'cancelReview': {
+ const $table = xGrid.value
+ if ($table) {
+ const selectRecords = $table.getCheckboxRecords()
+ if (selectRecords.length === 0) {
+ ElMessage.warning(t('productStock.unselectedData'))
+ return
+ }
+ let flowData = ref({
+
+ userId:userid,
+ userName:username,
+ patchLog:selectRecords
+
+ })
+ request.post("/Replenish/updateCancelReview",flowData.value).then((res) => {
+ if(res.code==200 && res.data===true){
+ ElMessage.success(t('basicData.msg.cancelReviewSuccess'))
+ router.push({path:'/main/Replenish/SelectReplenish',query:{random:Math.random()}})
+
+ }else{
+ ElMessage.warning(t('basicData.msg.cancelReviewFailWork'))
}
})
}
@@ -314,10 +344,10 @@
ref="xGrid"
v-bind="gridOptions"
v-on="gridEvents"
- :checkbox-config="checkBoxConfig"
+
>
- <!-- @toolbar-button-click="toolbarButtonClickEvent"-->
+ <!-- :checkbox-config="checkBoxConfig" @toolbar-button-click="toolbarButtonClickEvent"-->
<!-- 涓嬫媺鏄剧ず鎵�鏈変俊鎭彃妲�-->
<template #content="{ row }">
<ul class="expand-wrapper">
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 3071f7c..b4e0214 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
@@ -99,6 +99,7 @@
})
produceList = produceList.value.concat(deepClone(res.data.data))
+ console.log(produceList)
xGrid.value.reloadData(produceList)
gridOptions.loading = false
} else {
@@ -197,7 +198,9 @@
{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: 'remarks', title: t('processCard.notes'), width: '85px',filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod: filterChanged}
+ {field: 'remarks', title: t('processCard.notes'), width: '85px',filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod: filterChanged},
+ {field: 'bend_radius', title: t('order.bendRadius'), width: '110px',filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod: filterChanged}
+
],//琛ㄥご鎸夐挳
toolbarConfig: {
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 bc219e3..0a3edbe 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
@@ -794,8 +794,10 @@
if(user.user.address!==null && user.user.address!==''){
titleUploadData.value.thisProcess = user.user.address
titleUploadData.value.teamsGroupsName = user.user.userName
- if (user.user.address!=='鎶�鏈儴澶氭洸'){
- groupChangeProcess.value = true
+ console.log(user.user.address)
+ groupChangeProcess.value = true
+ if (user.user.address==='鎶�鏈儴澶氭洸' || user.user.address==='澶硅兌'){
+ groupChangeProcess.value = false
}
gridOptions.toolbarConfig.buttons[1].visible=false
}
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReplenishController.java b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReplenishController.java
index 18b9926..d2d255c 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReplenishController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReplenishController.java
@@ -84,4 +84,11 @@
public Result deleteReplenish( @RequestBody Map<String,Object> object){
return Result.seccess(replenishService.deleteReplenishSv(object));
}
+
+ @ApiOperation("琛ョ墖鍙嶅鎺ュ彛")
+ @SaCheckPermission("SelectReplenish.countertrial")
+ @PostMapping("/updateCancelReview")
+ public Result updateCancelReview( @RequestBody Map<String,Object> object){
+ return Result.seccess(replenishService.updateCancelReviewSv(object));
+ }
}
diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/PatchLogMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/PatchLogMapper.java
index ae834dd..7b1d5cb 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/PatchLogMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/PatchLogMapper.java
@@ -40,6 +40,9 @@
Boolean updatePatchBgMp(String reportingWorkId, String orderSort, Integer technologyNumber);
-
+
+ Boolean updateOrderProcessDetailCancel(@Param("patchLog") PatchLog patchLog,@Param("reportingWork") ReportingWork reportingWork);
+
+ Boolean updateReplenishCancel(@Param("patchLog") PatchLog patchLog);
}
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 cb91a78..bee52e5 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
@@ -80,4 +80,6 @@
Boolean ReviewReportingWorkMp(String substring, String process, String result, String userName);
String getPatchConditionMp(String reportingWorkId);
+
+ Integer getFirstStep(String processId, String orderSort, Integer technologyNumber, String interceptProcess);
}
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReplenishService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReplenishService.java
index 4267c03..6373257 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReplenishService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReplenishService.java
@@ -246,13 +246,20 @@
List<PatchLog> patchLoglist = JSONArray.parseArray(JSONObject.toJSONString(object.get("patchLog")), PatchLog.class);
if (!patchLoglist.isEmpty()){
for (PatchLog patchLog : patchLoglist) {
- //鍒犻櫎琛ョ墖琛ㄥ搴旇ˉ鐗噄d鏁版嵁
- patchMapper.deleteReplenishMp(patchLog.getPatchId());
- //淇敼娆＄牬鏄庣粏琛ㄨˉ鐗囨暟閲忓拰鐘舵��
- patchMapper.updatePatchDdMp(patchLog.getReportingWorkId(),patchLog.getOrderSort(),patchLog.getTechnologyNumber(),patchLog.getPatchNum());
- //淇敼鎶ュ伐鏄庣粏琛ㄧ姸鎬�
- patchMapper.updatePatchBgMp(patchLog.getReportingWorkId(),patchLog.getOrderSort(),patchLog.getTechnologyNumber());
+ PatchLog patchLog1=patchMapper.selectOne(new QueryWrapper<PatchLog>().eq("id",patchLog.getId()));
+ //鍒ゆ柇鏄惁宸茬粡瀹℃牳
+ if(patchLog1.getReviewStatus()==0){
+ //鍒犻櫎琛ョ墖琛ㄥ搴旇ˉ鐗噄d鏁版嵁
+ patchMapper.deleteReplenishMp(patchLog.getPatchId());
+ //淇敼娆＄牬鏄庣粏琛ㄨˉ鐗囨暟閲忓拰鐘舵��
+ patchMapper.updatePatchDdMp(patchLog.getReportingWorkId(),patchLog.getOrderSort(),patchLog.getTechnologyNumber(),patchLog.getPatchNum());
+ //淇敼鎶ュ伐鏄庣粏琛ㄧ姸鎬�
+ patchMapper.updatePatchBgMp(patchLog.getReportingWorkId(),patchLog.getOrderSort(),patchLog.getTechnologyNumber());
+ }
+ else{
+ saveState = false;
+ }
}
}
@@ -269,5 +276,66 @@
return saveState;
}
+
+ public Boolean updateCancelReviewSv(Map<String, Object> object) {
+ boolean saveState = true;
+ Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint();
+ //try {
+ String userName = "";
+ String userId = "";
+ if (object.get("userName") != null) {
+ userName = object.get("userName").toString();
+ }
+ if (object.get("userId") != null) {
+ userId = object.get("userId").toString();
+ }
+ //鑾峰彇瀵硅薄闆嗗悎寰幆杩涜鏂板淇敼
+ List<PatchLog> patchLoglist = JSONArray.parseArray(JSONObject.toJSONString(object.get("patchLog")), PatchLog.class);
+ if (!patchLoglist.isEmpty()){
+ for (PatchLog patchLog : patchLoglist) {
+ //鏌ヨ娴佺▼鍗″伐鑹烘祦绋�
+ String technologicalProcess = reportingWorkMapper.SelectTechnologicalProcess(patchLog.getProcessId(), String.valueOf(patchLog.getTechnologyNumber()));
+ if (technologicalProcess!=null || !technologicalProcess.equals("")) {
+ String[] processList = technologicalProcess.split("->");
+ //鑾峰彇宸ヨ壓娴佺▼绗竴涓伐搴�
+ String interceptProcess = processList[0];
+ Integer firstStep=reportingWorkMapper.getFirstStep(patchLog.getProcessId(),patchLog.getOrderSort(),patchLog.getTechnologyNumber(),interceptProcess);
+ if (firstStep>=patchLog.getPatchNum()){
+ ReportingWork reportingWork = reportingWorkMapper
+ .selectOne(new QueryWrapper<ReportingWork>().eq("reporting_work_id",patchLog.getReportingWorkId()));
+ //淇敼灏忕墖娴佺▼鍗℃暟閲�
+ patchMapper.updateOrderProcessDetailCancel(patchLog,reportingWork);
+ //瀹℃牳
+ patchMapper.updateReplenishCancel(patchLog);
+ }
+ else {
+ saveState = false;
+ }
+ }else{
+ saveState = false;
+ }
+
+ Log log = new Log();
+ log.setContent(object.toString());
+ log.setFunction("updateCancelReviewSv琛ョ墖鍙嶅");
+ log.setOperatorId((String) object.get("userId"));
+ log.setOperator((String) object.get("userName"));
+ logService.saveLog(log);
+ }
+ }
+
+// } catch (Exception e) {
+// TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
+// //灏嗗紓甯镐紶鍏ユ暟鎹簱
+// SysError sysError = new SysError();
+// sysError.setError(e.toString());
+// sysError.setFunc("updateCancelReviewSv");
+// sysErrorService.insert(sysError);
+// saveState = false;
+//
+// }
+
+ return saveState;
+ }
}
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 432e0c4..729b685 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
@@ -347,8 +347,8 @@
.eq(ReportingWork::getProcessId, processId.substring(0, 14))
.eq(ReportingWork::getThisProcess, reportingWork.get("process"))
.eq(ReportingWork::getReviewedState, 0)
- .eq(ReportingWork::getReviewed, userName)
- .setSql("reviewed_state =1");
+ .setSql("reviewed_state =1")
+ .set(ReportingWork::getReviewed, userName);
reportingWorkMapper.update(null, updateWrapper);
}else {
reportingWorkMapper.ReviewReportingWorkMp(processId.substring(0, 14),reportingWork.get("process"),technologyStr,userName);
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 fca9ad6..6dab8b2 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -249,6 +249,7 @@
p.thickness,
od.weight,
od.remarks,
+ od.bend_radius,
ods.S01,
ods.S02,
ods.S03,
diff --git a/north-glass-erp/src/main/resources/mapper/pp/PatchLogMapper.xml b/north-glass-erp/src/main/resources/mapper/pp/PatchLogMapper.xml
index 9a9f06a..d6accb8 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/PatchLogMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/PatchLogMapper.xml
@@ -175,5 +175,26 @@
where reporting_work_id=#{reportingWorkId} and order_number=#{orderSort} and technology_number=#{technologyNumber}
</update>
+ <update id="updateOrderProcessDetailCancel">
+ update sd.order_process_detail
+ set reporting_work_num=reporting_work_num + #{patchLog.patchNum}
+ where order_id = #{patchLog.orderId}
+ and process_id = #{patchLog.processId}
+ and order_number = #{patchLog.orderSort}
+ and technology_number = #{patchLog.technologyNumber}
+ and id <![CDATA[<]]> (select a.opdid
+ from (select id as opdid
+ from sd.order_process_detail opd
+ where opd.order_id = #{patchLog.orderId}
+ and opd.process_id = #{patchLog.processId}
+ and opd.order_number = #{patchLog.orderSort}
+ and opd.technology_number = #{patchLog.technologyNumber}
+ and process = #{reportingWork.thisProcess}) as a)
+ </update>
+
+ <update id="updateReplenishCancel">
+ update pp.patch_log set reviewer=null,review_status=0,update_time=now() where id=#{patchLog.id}
+ </update>
+
</mapper>
\ No newline at end of file
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 827b172..71f2ea7 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
@@ -811,4 +811,51 @@
<select id="getPatchConditionMp">
select count(*) from damage_details where reporting_work_id=#{reportingWorkId} and patch_status>0
</select>
+
+ <select id="getFirstStep">
+ SELECT
+
+ fc.quantity -odpd.reporting_work_num -odpd.broken_num + ifnull(patch.patch_num,0) as quantity
+ FROM
+ sd.order_detail AS od
+ LEFT JOIN sd.order_glass_detail AS ogd
+ ON od.order_id = ogd.order_id
+ AND od.order_number = ogd.order_number
+ LEFT JOIN flow_card AS fc
+ ON fc.order_id = ogd.order_id
+ and fc.production_id=ogd.production_id
+ AND fc.order_number = ogd.order_number
+ AND fc.technology_number = ogd.technology_number
+ left join sd.order_process_detail as odpd
+ ON odpd.order_id = fc.order_id
+ AND odpd.order_number = fc.order_number
+ AND odpd.technology_number = fc.technology_number
+ and odpd.process_id = fc.process_id
+ left join (
+ select ifnull(sum(a.patch_num),0) as patch_num,a.process_id,a.technology_number,a.order_sort
+ from patch_log as a
+ right join reporting_work
+ on a.reporting_work_id=reporting_work.reporting_work_id
+ where
+ reporting_work.this_process = #{interceptProcess}
+ and a.process_id=#{processId}
+ and a.order_sort=#{orderSort}
+ and POSITION(a.technology_number in #{technologyNumber})
+ and a.review_status = 1
+ group by a.process_id,a.order_sort,a.technology_number
+ ) as patch
+ on patch.process_id = fc.process_id
+ and patch.order_sort = fc.order_number
+ and patch.technology_number = fc.technology_number
+ left join sd.`order` as o on o.order_id=od.order_id
+
+ WHERE
+ fc.process_id = #{processId}
+ and fc.order_number=#{orderSort}
+ AND POSITION(fc.technology_number in #{technologyNumber})
+ AND odpd.process = #{interceptProcess}
+ group by fc.order_number,
+ ogd.technology_number
+ order by fc.order_number
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0