From bb85dbc5fc9a9ddda99132ae16887fd27959a854 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 06 一月 2025 16:18:48 +0800
Subject: [PATCH] 补充注释、语言，转工单时添加未勾选数据时的弹窗，修改报工新增查询复合工序不能查询出每一层的问题，修改次破报表响应超时问题
---
north-glass-erp/northglass-erp/src/lang/en.js | 3
north-glass-erp/northglass-erp/src/lang/zh.js | 3
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java | 5 -
north-glass-erp/src/main/java/com/example/erp/service/pp/ReplenishService.java | 15 ----
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java | 29 ++++-----
north-glass-erp/northglass-erp/src/lang/ar.js | 3
north-glass-erp/northglass-erp/src/lang/ru.js | 3
north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue | 5 +
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportWorkService.java | 2
north-glass-erp/src/main/java/com/example/erp/service/pp/ProductionSchedulingService.java | 7 --
north-glass-erp/src/main/resources/mapper/pp/Report.xml | 4 +
north-glass-erp/src/main/java/com/example/erp/service/pp/WorkOrderService.java | 10 +-
north-glass-erp/northglass-erp/src/views/pp/report/DamageReport.vue | 26 +++++++-
north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue | 9 +-
north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml | 4
north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java | 33 +++--------
16 files changed, 73 insertions(+), 88 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/lang/ar.js b/north-glass-erp/northglass-erp/src/lang/ar.js
index 41f3924..86f35c4 100644
--- a/north-glass-erp/northglass-erp/src/lang/ar.js
+++ b/north-glass-erp/northglass-erp/src/lang/ar.js
@@ -350,7 +350,8 @@
transferOrder:'鬲丨賵賷賱 丕賱胤賱亘',
perimeter:'賲丨賷胤',
deleteNo:'賮卮賱 丕賱丨匕賮貙 鬲丨賯賯 賲賲丕 廿匕丕 賰丕賳 賯丿 鬲賲 鬲賯爻賷賲丞',
- msg:'璇烽�夋嫨鎵�鏈夋暟鎹�'
+ msg:'璇烽�夋嫨鎵�鏈夋暟鎹�',
+ msgSelect:'璇烽�夋嫨璁㈠崟鍙�'
},
processCard:{
diff --git a/north-glass-erp/northglass-erp/src/lang/en.js b/north-glass-erp/northglass-erp/src/lang/en.js
index 83739d2..2c24a0b 100644
--- a/north-glass-erp/northglass-erp/src/lang/en.js
+++ b/north-glass-erp/northglass-erp/src/lang/en.js
@@ -350,7 +350,8 @@
transferOrder:'Transfer Order',
perimeter:'perimeter',
deleteNo:'Delete failed Check whether the shelf has been splited',
- msg:'Please select all data'
+ msg:'Please select all data',
+ msgSelect:'璇烽�夋嫨璁㈠崟鍙�'
},
processCard:{
diff --git a/north-glass-erp/northglass-erp/src/lang/ru.js b/north-glass-erp/northglass-erp/src/lang/ru.js
index 719fbac..a35aae4 100644
--- a/north-glass-erp/northglass-erp/src/lang/ru.js
+++ b/north-glass-erp/northglass-erp/src/lang/ru.js
@@ -350,7 +350,8 @@
transferOrder:'孝褉邪薪褋褎械褉薪褘泄 芯褉写械褉',
perimeter:'袙薪械褕薪懈泄 泻褉邪泄',
deleteNo:'校写邪谢械薪懈械 薪械褍写邪褔薪褘褏 锌褉芯胁械褉芯泻, 褔褌芯斜褘 锌褉芯胁械褉懈褌褜, 褉邪蟹写械谢械薪褘 谢懈 芯薪懈',
- msg:'袩芯卸邪谢褍泄褋褌邪, 胁褘斜械褉懈褌械 胁褋械 写邪薪薪褘械'
+ msg:'袩芯卸邪谢褍泄褋褌邪, 胁褘斜械褉懈褌械 胁褋械 写邪薪薪褘械',
+ msgSelect:'璇烽�夋嫨璁㈠崟鍙�'
},
processCard:{
diff --git a/north-glass-erp/northglass-erp/src/lang/zh.js b/north-glass-erp/northglass-erp/src/lang/zh.js
index db170ee..3e634b3 100644
--- a/north-glass-erp/northglass-erp/src/lang/zh.js
+++ b/north-glass-erp/northglass-erp/src/lang/zh.js
@@ -350,7 +350,8 @@
transferOrder:'杞伐鍗�',
perimeter:'鍛ㄩ暱',
deleteNo:'鍒犻櫎澶辫触锛屾鏌ユ槸鍚﹀凡鍒嗘灦',
- msg:'璇烽�夋嫨鎵�鏈夋暟鎹�'
+ msg:'璇烽�夋嫨鎵�鏈夋暟鎹�',
+ msgSelect:'璇烽�夋嫨璁㈠崟鍙�'
},
processCard:{
diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/DamageReport.vue b/north-glass-erp/northglass-erp/src/views/pp/report/DamageReport.vue
index 565ecad..e894c38 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/DamageReport.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/DamageReport.vue
@@ -79,8 +79,13 @@
const titleSelectJson = ref({
processType: [],
})
+let date = new Date(endTime); // 灏嗘棩鏈熷瓧绗︿覆杞负 Date 瀵硅薄
+
+// 浣跨敤 setDate 鏂规硶鍔犱竴澶�
+date.setDate(date.getDate() + 1);
+let newEndTime = date.toISOString().split('T')[0]; // 鑾峰彇 YYYY-MM-DD 鏍煎紡鐨勫瓧绗︿覆
//绗竴娆″姞杞芥暟鎹�
-request.post(`/report/damageReport/1/${total.pageSize}/${startTime}/${endTime}`, filterData.value).then((res) => {
+request.post(`/report/damageReport/1/${total.pageSize}/${startTime}/${newEndTime}`, filterData.value).then((res) => {
if (res.code == 200) {
total.dataTotal = res.data.total.total*1
@@ -98,8 +103,12 @@
const selectPageList = () => {
let startTime = form.date1[0]
let endTime = form.date1[1]
+ let date = new Date(endTime); // 灏嗘棩鏈熷瓧绗︿覆杞负 Date 瀵硅薄
- request.post(`/report/damageReport/${pageNum.value}/${total.pageSize}/${startTime}/${endTime}`, filterData.value).then((res) => {
+// 浣跨敤 setDate 鏂规硶鍔犱竴澶�
+ date.setDate(date.getDate() + 1);
+ let newEndTime = date.toISOString().split('T')[0]; // 鑾峰彇 YYYY-MM-DD 鏍煎紡鐨勫瓧绗︿覆
+ request.post(`/report/damageReport/${pageNum.value}/${total.pageSize}/${startTime}/${newEndTime}`, filterData.value).then((res) => {
if (res.code == 200) {
@@ -116,7 +125,11 @@
let startTime = form.date1[0]
let endTime = form.date1[1]
- request.post(`/report/damageReport/${pageNum.value}/${total.pageSize}/${startTime}/${endTime}`, filterData.value).then((res) => {
+ let date = new Date(endTime); // 灏嗘棩鏈熷瓧绗︿覆杞负 Date 瀵硅薄
+// 浣跨敤 setDate 鏂规硶鍔犱竴澶�
+ date.setDate(date.getDate() + 1);
+ let newEndTime = date.toISOString().split('T')[0]; // 鑾峰彇 YYYY-MM-DD 鏍煎紡鐨勫瓧绗︿覆
+ request.post(`/report/damageReport/${pageNum.value}/${total.pageSize}/${startTime}/${newEndTime}`, filterData.value).then((res) => {
if (res.code == 200) {
total.dataTotal = res.data.total.total * 1
@@ -157,7 +170,12 @@
let startTime = form.date1[0]
let endTime = form.date1[1]
- request.post(`/report/damageReport/1/${total.pageSize}/${startTime}/${endTime}`, filterData.value).then((res) => {
+ let date = new Date(endTime); // 灏嗘棩鏈熷瓧绗︿覆杞负 Date 瀵硅薄
+
+// 浣跨敤 setDate 鏂规硶鍔犱竴澶�
+ date.setDate(date.getDate() + 1);
+ let newEndTime = date.toISOString().split('T')[0]; // 鑾峰彇 YYYY-MM-DD 鏍煎紡鐨勫瓧绗︿覆
+ request.post(`/report/damageReport/1/${total.pageSize}/${startTime}/${newEndTime}`, filterData.value).then((res) => {
if (res.code == 200) {
total.dataTotal = res.data.total.total*1
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 7e98e83..816f8fc 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
@@ -138,8 +138,6 @@
button.name=t('basicData.review')
titleUploadData.value.qualityInspector=user.user.userName
}
-
-
gridOptions.toolbarConfig.buttons.push(button)
}
// getQuantity()
@@ -415,7 +413,7 @@
const $grid = xGrid.value
if ($grid) {
switch (code) {
- case 'saveReportingWork': {
+ case 'saveReportingWork': {//淇濆瓨
const errMap = await $grid.validate(true)
if (errMap) {
ElMessage.error(t('basicData.msg.checkoutLose'))
@@ -433,7 +431,7 @@
saveReportingWork(1,'save')
break
}
- case 'update': {
+ case 'update': {//淇敼
//鏍规嵁琛ョ墖鐘舵�佸垽鏂槸鍚﹁兘淇敼
// request.post(`/reportingWork/getPatchCondition/${route.query.reportingWorkId}`).then(async (res) => {
// if (res.code == 200) {
@@ -475,7 +473,7 @@
}
}
},
- menuClick({menu, row, column}) {
+ menuClick({menu, row, column}) {//鍙抽敭鑿滃崟
const $grid = xGrid.value
if ($grid) {
switch (menu.code) {
@@ -874,6 +872,7 @@
return item.saveFlag === 0
})
let process = titleUploadData.value.thisProcess
+ //鏆傛椂鍙栨秷
for(let item of uniqueByOrderNum){
if(!checkSameNumForId(notFinishList,item.order_number ) && (process=='澶硅兌' || process=='涓┖' || process=='鍖呰' ||process=='鎵撹兌鍜岀矘妗�')){
ElMessage.error(`${t('reportingWorks.pleaseCheckTheOrderNumber1')}':'
diff --git a/north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue b/north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue
index fe22c6d..3899ded 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue
@@ -307,9 +307,14 @@
const gridEvents = {
async toolbarButtonClick({code}) {
const $grid = xGrid.value
+ const checkedList = $grid.getCheckboxRecords()
if ($grid) {
switch (code) {
case 'transferOrder': {
+ if (checkedList.length !== 1) {
+ ElMessage.warning(t('workOrder.msgSelect'))
+ return
+ }
const idList = []
$grid.getCheckboxRecords().forEach(item => {
idList.push(item.orderId)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java
index fd66ee6..ed87da5 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java
@@ -129,11 +129,7 @@
public Boolean updateLayoutStatusSv(String processId, Integer state) {
if (!processId.isEmpty()) {
-// Integer Status = flowCardMapper.selectLayoutStatus(processId);
-
flowCardMapper.updateLayoutStatusMp(processId, state);
-
-
return true;
} else {
return false;
@@ -146,7 +142,6 @@
if (object.get("userName") != null) {
userName = object.get("userName").toString();
}
-
String productionId = "";
if (object.get("productionId") != null) {
productionId = object.get("productionId").toString();
@@ -181,7 +176,6 @@
orderProcessDetailList.forEach(
orderGlassDetail -> orderGlassDetail.setProcessId(flowCard.getProcessId()));
-
//璧嬪�艰鍗曞伐鑹鸿〃
orderProcessDetailMapper.insertOrderProcessDetail(orderProcessDetailList);
}
@@ -207,7 +201,6 @@
map.put("data", flowCardMapper.selectNoSchedulingMp(selectTime1, selectTime2, orderId, processes, flowCard));
}
-
return map;
}
@@ -296,7 +289,7 @@
//鏄惁鍖呭惈鍒囧壊
//boolean containsCutting = flowCard.getProcess().contains("鍒囧壊");
String processSub=flowCard.getProcess().substring(0, 2);
- if(processSub.equals("澶硅兌") || processSub.equals("涓┖")){
+ if(processSub.equals("澶硅兌") || processSub.equals("涓┖")){//宸ヨ壓鏄惁鍖呭惈澶硅兌涓┖
itemmap.put("detail", flowCardMapper.getPrimaryListLimt(flowCard.getProcessId(), String.valueOf(flowCard.getTechnologyNumber()),flowCard.getGlassChild(),flowCard.getProcess(),flowCard.getOrderId()));
List<Map<String, Object>> detailList = flowCardMapper.getDetailList(flowCard.getProcessId(), flowCard.getTechnologyNumber(),flowCard.getProcess());
@@ -311,7 +304,6 @@
}
else {
-
//娴佺▼鍗℃槑缁嗘暟鎹�
if (printLike.equals("")||printLike.equals("null") ){
itemmap.put("detail", flowCardMapper.getPrimaryListMerge(flowCard.getProcessId(), printMerge, flowCard.getOrderId()));
@@ -471,18 +463,13 @@
public Map<String, Object> getSelectPrintLabelSv1(Map<String, Object> object) {
Map<String, Object> map = new HashMap<>();
-
List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();//鏈�缁堢粨鏋�
List<FlowCard> flowCardList = JSONArray.parseArray(JSONObject.toJSONString(object.get("printList")), FlowCard.class);
if (!flowCardList.isEmpty()) {
for (FlowCard flowCard : flowCardList) {
- // Integer count=flowCardMapper.getPrintLabelCount(flowCard.getProcessId(), flowCard.getTechnologyNumber());
Map<String, Object> itemmap = new HashMap<>();
- // for (int i = 0; i < count; i++) {
itemmap.put("data", flowCardMapper.getPrintLabel1(flowCard.getProcessId(), flowCard.getTechnologyNumber()));
list.add(itemmap);
- //}
-
}
}
map.put("data", list);
@@ -497,13 +484,9 @@
List<FlowCard> flowCardList = JSONArray.parseArray(JSONObject.toJSONString(object.get("printList")), FlowCard.class);
if (!flowCardList.isEmpty()) {
for (FlowCard flowCard : flowCardList) {
- // Integer count=flowCardMapper.getPrintLabelCount(flowCard.getProcessId(), flowCard.getTechnologyNumber());
Map<String, Object> itemmap = new HashMap<>();
- // for (int i = 0; i < count; i++) {
itemmap.put("data", flowCardMapper.getPrintLabelDetail(flowCard));
list.add(itemmap);
- //}
-
}
}
map.put("data", list);
@@ -521,7 +504,6 @@
List<FlowCard> FlowCardList = JSONArray.parseArray(JSONObject.toJSONString(object.get("flowCard")), FlowCard.class);
if (!FlowCardList.isEmpty()) {
for (FlowCard flowCard : FlowCardList) {
- // flowCardMapper.printSortMp(flowCard.getProcessId(),flowCard.getOrderNumber(),flowCard.getTechnologyNumber(),flowCard.getSort());
//鍒ゆ柇淇濆瓨鐨勬暟鎹槸鍚﹀凡瀛樺湪
Integer count = flowCardMapper.printAddSortCountMp(flowCard.getProcessId(),flowCard.getOrderNumber(),flowCard.getTechnologyNumber(),flowCard.getSort(),flowCard.getProcess());
if (count >0){
@@ -542,7 +524,7 @@
if (!flowCardList.isEmpty()) {
Set<String> processedProcessIds = new HashSet<>(); // 鐢ㄦ潵瀛樻斁宸插鐞嗚繃鐨� processId
- if (lableType != 2){
+ if (lableType != 2){//鎴愬搧鏍囩
for (FlowCard flowCard : flowCardList) {
String processId = flowCard.getProcessId();
@@ -558,7 +540,7 @@
processedProcessIds.add(processId);
}
}
- else{
+ else{//灏忕墖鏍囩
for (FlowCard flowCard : flowCardList) {
Map<String, Object> itemmap = new HashMap<>();
itemmap.put("data", flowCardMapper.getPrintCustomDataSemi(flowCard.getProcessId(),flowCard.getTechnologyNumber(),flowCard.getProcess()));
@@ -739,7 +721,7 @@
if (!flowCardList.isEmpty()) {
Set<String> processedProcessIds = new HashSet<>(); // 鐢ㄦ潵瀛樻斁宸插鐞嗚繃鐨� processId
- if (lableType != 2){
+ if (lableType != 2){//鎴愬搧鏍囩
for (FlowCard flowCard : flowCardList) {
String processId = flowCard.getProcessId();
String orderNumber = flowCard.getOrderNumber().toString();
@@ -757,7 +739,7 @@
processedProcessIds.add(orderNumber);
}
}
- else{
+ else{//灏忕墖鏍囩
for (FlowCard flowCard : flowCardList) {
Map<String, Object> itemmap = new HashMap<>();
itemmap.put("data", flowCardMapper.getPrintCustomDataSemi(flowCard.getProcessId(),flowCard.getTechnologyNumber(),flowCard.getProcess()));
@@ -863,6 +845,7 @@
}
List<FlowCard> flowCardList = JSONArray.parseArray(JSONObject.toJSONString(object.get("composing")), FlowCard.class);
for (FlowCard flowCard : flowCardList) {
+ //鏌ヨ鏄惁鎶ュ伐
Integer count = flowCardMapper.reportingWorkCount(flowCard.getProcessId());
if (count == 0) {
//淇敼鍒嗘灦鐘舵��
@@ -913,10 +896,12 @@
Set<String> processedProcessIds = new HashSet<>(); // 鐢ㄦ潵瀛樻斁宸插鐞嗚繃鐨� processId
for (FlowCard flowCard : flowCardList) {
Map<String, Object> itemmap = new HashMap<>();
- if (detailType==0){
+ //鏄惁鏄伐绋嬫槑缁嗘墦鍗�
+ if (detailType==0){//宸ョ▼鎵撳嵃鏄庣粏
itemmap.put("data", flowCardMapper.getPrintCustomDataProjectDetail(flowCard.getProjectNo(),flowCard.getStockId()));
}
+ //闈炲伐绋嬫墦鍗�
else if (detailType==1) {
itemmap.put("data", flowCardMapper.getPrintCustomDataProject(flowCard.getProjectNo()));
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/ProductionSchedulingService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/ProductionSchedulingService.java
index 77ddde2..94449b7 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/ProductionSchedulingService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/ProductionSchedulingService.java
@@ -78,11 +78,7 @@
List<ProductionScheduling> schedulinglist = JSONArray.parseArray(JSONObject.toJSONString(object.get("scheduling")), ProductionScheduling.class);
if (!schedulinglist.isEmpty()) {
for (ProductionScheduling productionScheduling : schedulinglist) {
- //鏌ヨ宸叉帓浜у伐搴忔暟閲�
- // Integer num = productionSchedulingMapper.selectNumberMp(productionScheduling.getOrderId(),productionScheduling.getOrderNumber(),processes);
-
productionSchedulingMapper.insertSelective(schedulingId,productionScheduling.getOrderGlassDetail().getOrderId(),productionScheduling.getOrderNumber(),productionScheduling.getTechnologyNumber(),processes,productionScheduling.getSchedulingQuantity(),productionScheduling.getScheduledStartTime(),productionScheduling.getPlanEndTime(),productionScheduling.getNotes());
- // System.out.println(productionScheduling.getOrderId()+"***"+productionScheduling.getOrderGlassDetail().getOrderId()+"--"+productionScheduling.getOrderDetail().getOrderId());
}
return true;
}
@@ -99,7 +95,6 @@
if (!Scheduling.isEmpty()) {
for (ProductionScheduling productionScheduling : Scheduling) {
productionSchedulingMapper.deleteSchedulingMp(productionScheduling.getSchedulingId());
- // System.out.println(productionScheduling.getOrderNumber()+"***"+productionScheduling.getOrderId());
}
return true;
}
@@ -118,7 +113,6 @@
if (!schedulinglist.isEmpty()) {
for (ProductionScheduling productionScheduling : schedulinglist) {
productionSchedulingMapper.examineSchedulingMp(productionScheduling.getSchedulingId(),userName,productionScheduling.getSchedulingQuantity(),productionScheduling.getNotes());
- // System.out.println(productionScheduling.getOrderNumber()+"***"+productionScheduling.getOrderId());
}
return true;
}
@@ -133,7 +127,6 @@
if (!schedulinglist.isEmpty()) {
for (ProductionScheduling productionScheduling : schedulinglist) {
productionSchedulingMapper.cancelReviewSchedulingMp(productionScheduling.getSchedulingId());
- // System.out.println(productionScheduling.getOrderNumber()+"***"+productionScheduling.getOrderId());
}
return true;
}
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 762d829..54885a1 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
@@ -217,12 +217,12 @@
List<FlowCard> flowCardList = JSONArray.parseArray(JSONObject.toJSONString(object.get("printList")), FlowCard.class);
if (!flowCardList.isEmpty()) {
for (FlowCard flowCard : flowCardList) {
- if (lableType != 2){
+ if (lableType != 2){//鎴愬搧鏍囩
Map<String, Object> itemmap = new HashMap<>();
itemmap.put("data", flowCardMapper.getRepairPrintCustomData(flowCard.getProcessId(),flowCard.getTechnologyNumber(),flowCard.getReportingWorkId()));
list.add(itemmap);
}
- else{
+ else{//灏忕墖鏍囩
Map<String, Object> itemmap = new HashMap<>();
itemmap.put("data", flowCardMapper.getRepairPrintCustomDataSemi(flowCard.getProcessId(),flowCard.getTechnologyNumber(),flowCard.getReportingWorkId()));
list.add(itemmap);
@@ -335,17 +335,6 @@
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/ReportService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java
index 2e5958a..acb75f4 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java
@@ -119,7 +119,6 @@
list.add(startDate);
list.add(endDate);
map.put("selectDate", list);
-// map.put("total",orderMapper.getPageTotal(offset, pageSize, startDate, endDate, orderDetail));
return map;
}
@@ -148,7 +147,7 @@
} else if (optionVal.equals("3")) {
} else {
-
+ //娌℃湁閫夋嫨鍒嗙粍
map.put("data", reportMapper.workInProgressMp(offset, pageSize, orderId, inputProject, selectProcesses, workInProgressDTO));
map.put("total", reportMapper.workInProgressTotal(offset, pageSize, orderId, inputProject, selectProcesses, workInProgressDTO));
@@ -352,7 +351,6 @@
}
public List exportDamageReportSv(List<LocalDate> dates) {
-
return reportMapper.exportDamageReportMp(dates);
}
@@ -375,7 +373,6 @@
}
public List exportWorkInProgressSv(Map<String, Object> dates) {
- //List<LocalDate> date= (List<LocalDate>) dates.get("date");
String process= (String) dates.get("processes");
String inputVal= (String) dates.get("inputVal");
String project= (String) dates.get("project");
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportWorkService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportWorkService.java
index 41a1fdf..ad2b7a4 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportWorkService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportWorkService.java
@@ -29,7 +29,6 @@
/*鑾峰彇杩斿伐绠＄悊鏁版嵁*/
public Map<String,Object> reworkMangageData (Integer pageNum, Integer pageSize,String startTime,String endTime) {
Integer offset = (pageNum-1)*pageSize;
-
Map<String,Object> map = new HashMap<>();
map.put("data",reportingWorkDetailMapper.reworkDataManage(offset,pageSize,startTime,endTime));
return map;
@@ -38,7 +37,6 @@
/*鑾峰彇杩斿伐绠＄悊鏁版嵁*/
public Map<String,Object> reworkMangageData2 (Integer pageNum, Integer pageSize,String startTime,String endTime,ReportingWorkDetail reportingWorkDetail ) {
Integer offset = (pageNum-1)*pageSize;
-
Map<String,Object> map = new HashMap<>();
map.put("data",reportingWorkDetailMapper.reworkDataManage2(offset,pageSize,startTime,endTime, reportingWorkDetail));
return map;
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 d68ebdd..a72b0d5 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
@@ -126,8 +126,9 @@
map.put("device", reportingWorkMapper.SelectWorkBasicDeviceMp(process));
//鐝粍涓嬫媺妗�
map.put("teams", reportingWorkMapper.SelectWorkBasicTeamsMp(process));
-
+ //娆＄牬绫诲瀷
map.put("breakageType", reportingWorkMapper.selectBasicNameByType("breakagetype"));
+ //娆＄牬鍘熷洜
map.put("breakageReason", reportingWorkMapper.selectBasicNameByType("breakagereason"));
//鏌ヨ鏈伐搴忔姤宸ラ渶瑕佸摢鍑犲眰锛屼笂宸ュ簭鏄粈涔�
@@ -177,8 +178,6 @@
}
});
}
-
-
map.put("Detail",details );
}
}
@@ -197,8 +196,6 @@
//鍘嗗彶宸ュ簭
map.put("historyProcess", reportingWorkMapper.SelectHistoryProcessMp(historyProcess, process));
}
-
-
return map;
}
@@ -210,6 +207,7 @@
map.put("process", reportingWorkMapper.SelectProcessMp());
}
else {
+ //瀵规寚瀹氬伐搴忓崟鐙煡璇�
if (process.equals("澶硅兌")){
map.put("process",reportingWorkMapper.getSelectProcessJiajiao() );
}
@@ -240,7 +238,7 @@
reportingWork.setProcessId(processIdStr[0]);
int reviewState = (int) reportingWorkJson.get("type");
- if (reviewState == 1) {
+ if (reviewState == 1) {//瀹℃牳閫氳繃
reportingWork.setReviewed(reportingWork.getCreator());
reportingWork.setReviewedState(1);
} else {
@@ -252,14 +250,6 @@
reportingWorkMapper.insert(reportingWork);
//鍓〃寰幆鎻掑叆锛屽苟涓旀彃鍏ユ鐮翠俊鎭〃銆傚啀鏍规嵁娆＄牬淇℃伅淇敼璁㈠崟鐜荤拑娴佺▼琛ㄧ殑瀹屽伐鏁伴噺涓庡埡鐮存暟閲�
reportingWorkDetails.forEach(reportingWorkDetail -> {
-// reportingWork.setThisProcessQuantity(
-// reportingWork.getThisProcessQuantity()
-// +reportingWorkDetail.getCompletedQuantity()
-// +reportingWorkDetail.getBreakageQuantity());
-// reportingWork.setThisCompletedQuantity(
-// reportingWork.getThisCompletedQuantity()+reportingWorkDetail.getCompletedQuantity());
-// reportingWork.setThisWornQuantity(
-// reportingWork.getThisWornQuantity()+reportingWorkDetail.getBreakageQuantity());
int qualityInsStatus = (int) reportingWorkJson.get("qualityInsStatus");
reportingWorkDetail.setReportingWorkId(reportingWorkId);
@@ -378,7 +368,7 @@
int index = processId.lastIndexOf("/") + 1;
String result = processId.substring(index);
String technologyStr = reportingWork.get("technologyStr");
-
+//鍚堢墖宸ュ簭
if (thisProcess.equals("澶硅兌") || thisProcess.equals("涓┖") || thisProcess.equals("鍖呰")){
LambdaUpdateWrapper
<ReportingWork> updateWrapper = new LambdaUpdateWrapper<>();
@@ -422,8 +412,11 @@
});
Map<String, Object> map = new HashMap<>();
+ //鎶ュ伐涓昏〃
map.put("reportingWork", reportingWork);
+ //鎶ュ伐鏄庣粏
map.put("reportingWorkDetails", reportingWorkDetails);
+ //鎶ュ伐涓嬫媺妗嗘暟鎹�
map.put("basic", getReportingWorkBase(reportingWork.getProcessId(), reportingWork.getThisProcess()));
//鏍规嵁鎶ュ伐缂栧彿鑾峰彇灞�
map.put("layer", reportingWorkMapper.selectLayerByReportingWorkId(reportingWorkId));
@@ -440,8 +433,9 @@
map.put("deviceType", reportingWorkMapper.SelectWorkBasicDeviceMp(thisProcess));
//鐝粍涓嬫媺妗�
map.put("teamsType", reportingWorkMapper.SelectWorkBasicTeamsMp(thisProcess));
-
+ //娆＄牬绫诲瀷
map.put("breakageType", reportingWorkMapper.selectBasicNameByType("breakagetype"));
+ //娆＄牬鍘熷洜
map.put("breakageReason", reportingWorkMapper.selectBasicNameByType("breakagereason"));
//鑾峰彇璇ユ祦绋嬪崱鍙峰巻鍙叉姤宸ュ伐搴�
@@ -477,7 +471,7 @@
.delete(new LambdaQueryWrapper<ReportingWorkDetail>()
.eq(ReportingWorkDetail::getReportingWorkId, reportingWork.getReportingWorkId()));
- //鏇寸粏鎶ュ伐涓昏〃
+ //鏇存柊鎶ュ伐涓昏〃
int qualityInsStatus = (int) reportingWorkJson.get("qualityInsStatus");
reportingWorkMapper.updateById(reportingWork);
reportingWorkDetails.forEach(reportingWorkDetail -> {
@@ -490,6 +484,7 @@
damageDetail.setProcessId(reportingWork.getProcessId());
damageDetail.setOrderNumber(reportingWorkDetail.getOrderNumber());
damageDetail.setTechnologyNumber(reportingWorkDetail.getTechnologyNumber());
+ //鏄惁淇敼璐ㄦ鐘舵��
if (!Objects.equals(reportingWork.getThisProcess(), damageDetail.getResponsibleProcess()) && qualityInsStatus==2) {
damageDetail.setQualityInsStatus(1);
}
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/WorkOrderService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/WorkOrderService.java
index 284cc42..6dc5223 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/WorkOrderService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/WorkOrderService.java
@@ -24,9 +24,9 @@
//鏌ヨ宸ュ崟
public Map<String, Object> defaultDateWork(Date selectTime1, Date selectTime2, Integer state, OrderGlassDetail orderGlassDetail) {
Map<String, Object> map = new HashMap<>();
- if (state == 1) {
+ if (state == 1) {//宸茶浆宸ュ崟
map.put("data", workOrderMapper.selectWordOrder(selectTime1, selectTime2, orderGlassDetail));
- } else {
+ } else {//鏈浆宸ュ崟
map.put("data", workOrderMapper.selectWordOrderNo(selectTime1, selectTime2, orderGlassDetail));
}
@@ -104,10 +104,10 @@
Integer noWorkCount = workOrderMapper.selectWorkCount(orderId);
//鏌ヨ璇ヨ鍗曡浆鐢熶骇璁㈠崟鐨勬潯鏁�
Integer yesWorkCount = workOrderMapper.selectYesWorkCount(orderId);
- if (noWorkCount.equals(yesWorkCount)) {
- workOrderMapper.updateWorkType(orderId, state);
+ if (noWorkCount.equals(yesWorkCount)) {//鍒ゆ柇璁㈠崟鏄惁鍏ㄩ儴杞伐鍗�
+ workOrderMapper.updateWorkType(orderId, state);//鍏ㄩ儴
} else {
- workOrderMapper.updateWorkType(orderId, states);
+ workOrderMapper.updateWorkType(orderId, states);//閮ㄥ垎
}
return true;
}
diff --git a/north-glass-erp/src/main/resources/mapper/pp/Report.xml b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
index 4aebb63..87569ad 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/Report.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
@@ -573,7 +573,9 @@
AND dd.technology_number = ogd.technology_number
left join sd.order_detail as od on o.order_id = od.order_id and od.order_number=ogd.order_number
WHERE
- DATE_FORMAT((rw.reporting_work_time), '%Y-%m-%d') between #{selectTime1} and #{selectTime2}
+ rw.reporting_work_time >= #{selectTime1}
+ AND rw.reporting_work_time < #{selectTime2}
+
AND dd.available = 0
AND LENGTH( rw.process_id )= 14
<if test="damageReportDTO.orderId != null and damageReportDTO.orderId != ''">
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 3099e9c..4f8c382 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
@@ -213,7 +213,7 @@
LEFT JOIN sd.order_glass_detail AS ogd
ON od.order_id = ogd.order_id
AND od.order_number = ogd.order_number
- <if test="process == '澶硅兌' or (process == '鎵撹兌鍜岀矘妗�' and previousProcess=='澶硅兌')">
+ <if test="process == '澶硅兌' or (process == '鎵撹兌鍜岀矘妗�')">
AND ogd.`group` = (select `group`
from sd.order_glass_detail
where order_id = ogd.order_id
@@ -943,7 +943,7 @@
LEFT JOIN sd.order_glass_detail AS ogd
ON od.order_id = ogd.order_id
AND od.order_number = ogd.order_number
- <if test="process == '澶硅兌' or (process == '鎵撹兌鍜岀矘妗�' and previousProcess=='澶硅兌')">
+ <if test="process == '澶硅兌' or (process == '鎵撹兌鍜岀矘妗�')">
AND ogd.`group` = (select `group`
from sd.order_glass_detail
where order_id = ogd.order_id
--
Gitblit v1.8.0