From 4dcb5e299757924aef0edc4d608d2305dbedc780 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 18 九月 2025 08:59:33 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java | 28 +++++++++++++++++++++++-----
1 files changed, 23 insertions(+), 5 deletions(-)
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 f75c8ed..7db74d9 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
@@ -1035,7 +1035,7 @@
.eq("order_sort", reportingWork.get("oldOrderNumber"))
.eq("review_status",0)
);
- if (patchLogs.isEmpty()){
+ if (!patchLogs.isEmpty()){
result.put("msg","鏃ц鍗曞瓨鍦ㄨˉ鐗囨湭瀹℃牳鏁版嵁");
result.put("data",false);
return result;
@@ -1046,7 +1046,7 @@
.eq("order_sort", reportingWork.get("oldOrderNumber"))
.eq("review_status",0)
);
- if (patchLogs.isEmpty()){
+ if (!patchLogs.isEmpty()){
result.put("msg","鏃ц鍗曞瓨鍦ㄨ繑宸ユ湭瀹℃牳鏁版嵁锛岃鍏堝鏍告姤宸ュ悗鍐嶈繘琛岃浆鍑�");
result.put("data",false);
return result;
@@ -1172,7 +1172,7 @@
//restTemplate.postForObject("http://localhost:8086/order/test",orderNumberTransferList,String.class);
//鍚憁es鍙戦�乭ttp璇锋眰
- ResponseEntity<OrderNumberTransferDTO> response =restTemplate.exchange(
+ /*ResponseEntity<OrderNumberTransferDTO> response =restTemplate.exchange(
"http://localhost:88/api/loadGlass/order/order/orderChange",
HttpMethod.POST,
new HttpEntity<>(orderNumberTransferList),
@@ -1184,7 +1184,9 @@
}else{
result.put("msg","杩炴帴mes鍝嶅簲瓒呮椂");
result.put("data",false);
- }
+ }*/
+
+ result.put("data",true);
return result;
}
@@ -1257,4 +1259,20 @@
//List<Map<String, Object>> flowCard = reportingWorkMapper.getStorageData();
//finishedGoodsInventoryService.addSelectWarehousing(object);
return null;
- }}
+ }
+
+ public Map<String, Object> mesBasicDataSv() {
+ Map<String, Object> map = new HashMap<>();
+ //宸ュ簭
+ map.put("process",flowCardMapper.getProcessNameList());
+ //璁惧涓嬫媺妗�
+ map.put("device", reportingWorkMapper.mesSelectWorkBasicDeviceMp());
+ //鐝粍涓嬫媺妗�
+ map.put("teams", reportingWorkMapper.mesSelectWorkBasicTeamsMp());
+ //娆＄牬绫诲瀷
+ map.put("breakageType", reportingWorkMapper.selectBasicNameByType("breakagetype"));
+ //娆＄牬鍘熷洜
+ map.put("breakageReason", reportingWorkMapper.selectBasicNameByType("breakagereason"));
+ return map;
+ }
+}
--
Gitblit v1.8.0