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/src/main/java/com/example/erp/service/pp/FlowCardService.java | 33 +++++++++------------------------
1 files changed, 9 insertions(+), 24 deletions(-)
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()));
--
Gitblit v1.8.0