From 6146ab970705d0233a12b9fe475f9756e3271aa1 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 02 四月 2025 08:43:16 +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 | 127 ++++++++++++++++++++++++++++++++++++++----
1 files changed, 115 insertions(+), 12 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 ea5f781..1eb8bb5 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
@@ -67,6 +67,8 @@
private final SysErrorService sysErrorService;
private final FinishedOperateLogMapper finishedOperateLogMapper;
private final RestTemplate restTemplate;
+ private final PatchLogMapper patchLogMapper;
+ private final ReworkMapper reworkMapper;
/*public ReportingWorkService(ReportingWorkMapper reportingWorkMapper, BasicDateProduceMapper basicDateProduceMapper, DamageDetailsMapper damageDetailsMapper, ReportingWorkDetailMapper reportingWorkDetailMapper, OrderProcessDetailMapper orderProcessDetailMapper, OrderProcessDetailService orderProcessDetailService, OrderMapper orderMapper, FlowCardMapper flowCardMapper, LogService logService, LogMapper logMapper, OrderGlassDetailMapper orderGlassDetailMapper, SysErrorService sysErrorService, OrderDetailMapper orderDetailMapper, FinishedOperateLogMapper finishedOperateLogMapper, ReportingWorkTransferMapper reportingWorkTransferMapper) {
@@ -204,6 +206,8 @@
map.put("historyTeams", reportingWorkMapper.historyTeamsMp(processIdStr, process));
//鍘嗗彶宸ュ簭
map.put("historyProcess", reportingWorkMapper.SelectHistoryProcessMp(historyProcess, process));
+ //鏄惁鍚堢墖宸ュ簭
+ map.put("laminating", laminating);
}
return map;
}
@@ -842,12 +846,24 @@
@Transactional(rollbackFor = Exception.class)
public Object reportingWorkTransferSv(Map<String, String> reportingWork) {
+ Map<String, Object> result = new HashMap<>();
+
Order oldOrder = orderMapper.selectOrderId(reportingWork.get("oldOrderId"));
OrderDetail oldOrderDetail = orderDetailMapper.selectOne(
new QueryWrapper<OrderDetail>()
.eq("order_id", reportingWork.get("oldOrderId"))
.eq("order_number", reportingWork.get("oldOrderNumber"))
);
+ if(oldOrder == null){
+ result.put("msg","鏃ц鍗曚笉瀛樺湪");
+ result.put("data",false);
+ return result;
+ }
+ if(oldOrderDetail == null){
+ result.put("msg","鏃ц鍗曟搴忓彿涓嶅瓨鍦�");
+ result.put("data",false);
+ return result;
+ }
Order newOrder = orderMapper.selectOrderId(reportingWork.get("newOrderId"));
OrderDetail newOrderDetail = orderDetailMapper.selectOne(
@@ -855,15 +871,37 @@
.eq("order_id", reportingWork.get("newOrderId"))
.eq("order_number", reportingWork.get("newOrderNumber"))
);
+ if (newOrder == null){
+ result.put("msg","鏂拌鍗曚笉瀛樺湪");
+ result.put("data",false);
+ return result;
+ }
+ if(newOrderDetail == null){
+ result.put("msg","鏂拌鍗曟搴忓彿涓嶅瓨鍦�");
+ result.put("data",false);
+ return result;
+ }
+ if(Objects.equals(oldOrder.getOrderId(), newOrder.getOrderId())){
+ result.put("msg","鏂版棫璁㈠崟鍙蜂竴鑷�");
+ result.put("data",false);
+ return result;
+ }
+
if(!Objects.equals(oldOrder.getCustomerId(), newOrder.getCustomerId())){
- return "鏂版棫璁㈠崟瀹㈡埛涓嶄竴鑷�";
+ result.put("msg","鏂版棫璁㈠崟瀹㈡埛涓嶄竴鑷�");
+ result.put("data",false);
+ return result;
}
if(!Objects.equals(oldOrderDetail.getProductId(), newOrderDetail.getProductId())){
- return "鏂版棫璁㈠崟浜у搧涓嶄竴鑷�";
+ result.put("msg","鏂版棫璁㈠崟浜у搧涓嶄竴鑷�");
+ result.put("data",false);
+ return result;
}
if (!Objects.equals(oldOrderDetail.getWidth(), newOrderDetail.getWidth())
|| !Objects.equals(oldOrderDetail.getHeight(), newOrderDetail.getHeight())){
- return "鏂版棫璁㈠崟灏哄涓嶄竴鑷�";
+ result.put("msg","鏂版棫璁㈠崟灏哄涓嶄竴鑷�");
+ result.put("data",false);
+ return result;
}
@@ -874,7 +912,9 @@
.eq("order_number", reportingWork.get("oldOrderNumber"))
);
if(oldOrderProcessDetailList.isEmpty()){
- return "鏃ц鍗曟湭鍒嗘祦绋嬪崱";
+ result.put("msg","鏃ц鍗曟湭鍒嗘祦绋嬪崱");
+ result.put("data",false);
+ return result;
}
//鑾峰彇鏂拌鍗曟槸鍚︽祦绋嬪崱鏄惁瀛樺湪
List<OrderProcessDetail> newOrderProcessDetailList = orderProcessDetailMapper
@@ -883,7 +923,9 @@
.eq("order_number", reportingWork.get("newOrderNumber"))
);
if(newOrderProcessDetailList.isEmpty()){
- return "鏂拌鍗曟湭鍒嗘祦绋嬪崱";
+ result.put("msg","鏂拌鍗曟湭鍒嗘祦绋嬪崱");
+ result.put("data",false);
+ return result;
}
//鏂拌鍗曟槸鍚﹀瓨鍦ㄥ凡缁忔帓鐗堝簭鍙�
List<FlowCard> newFlowCardLayoutStatus = flowCardMapper.selectList(new QueryWrapper<FlowCard>()
@@ -892,8 +934,21 @@
.gt("layout_status",0)
);
if(!newFlowCardLayoutStatus.isEmpty()){
- return "鏂拌鍗曟搴忓彿瀛樺湪鎺掔増";
+ result.put("msg","鏂拌鍗曟搴忓彿瀛樺湪鎺掔増");
+ result.put("data",false);
+ return result;
}
+ List<ReportingWorkTransfer> reportingWorkTransferList = reportingWorkTransferMapper
+ .selectList(new QueryWrapper<ReportingWorkTransfer>()
+ .eq("old_order", reportingWork.get("newOrderId"))
+ .eq("old_order_number", reportingWork.get("newOrderNumber"))
+ );
+ if(!reportingWorkTransferList.isEmpty()){
+ result.put("msg","鏂拌鍗曞簭鍙蜂箣鍓嶅凡杞嚭鎶ュ伐鏁版嵁锛屾棤娉曡繘琛岃浆鍏�");
+ result.put("data",false);
+ return result;
+ }
+
//鑾峰彇鏃ц鍗曟姤宸ユ暟鎹眹鎬�
List<OrderProcessDetail> oldOrderProcessDetailForReport = orderProcessDetailMapper
.selectList(new QueryWrapper<OrderProcessDetail>()
@@ -901,6 +956,51 @@
.eq("order_number", reportingWork.get("oldOrderNumber"))
.gt("reporting_work_num",0)
);
+
+ if (oldOrderProcessDetailForReport.isEmpty()){
+ result.put("msg","鏃ц鍗曟病鏈夊彲杞嚭鐨勬姤宸ユ暟鎹�");
+ result.put("data",false);
+ return result;
+ }
+ List<String> oldOrderProcessIdList = new ArrayList<>();
+ oldOrderProcessDetailList.forEach(oldOrderProcessDetail -> oldOrderProcessIdList.add(oldOrderProcessDetail.getProcessId()));
+
+ //鑾峰彇鏃ф暟鎹牬鎹熻〃鏄惁瀛樺湪鐮存崯
+ List<DamageDetails> damageDetails = damageDetailsMapper.selectList(
+ new QueryWrapper<DamageDetails>()
+ .in("process_id",oldOrderProcessIdList)
+ .eq("order_number", reportingWork.get("oldOrderNumber"))
+ .eq("quantity",0)
+ );
+ if(!damageDetails.isEmpty()){
+ result.put("msg","鏃ц鍗曞瓨鍦ㄦ姤宸ユ湭澶勭悊鐮存崯鏁版嵁");
+ result.put("data",false);
+ return result;
+ }
+ //鑾峰彇琛ョ墖琛ㄦ槸鍚﹀瓨鍦ㄨˉ鐗囨湭瀹℃牳鐘舵��
+ List<PatchLog> patchLogs = patchLogMapper.selectList(
+ new QueryWrapper<PatchLog>()
+ .eq("order_id", reportingWork.get("oldOrderId"))
+ .eq("order_sort", reportingWork.get("oldOrderNumber"))
+ .eq("review_status",0)
+ );
+ if (patchLogs.isEmpty()){
+ result.put("msg","鏃ц鍗曞瓨鍦ㄨˉ鐗囨湭瀹℃牳鏁版嵁");
+ result.put("data",false);
+ return result;
+ }
+ List<Rework> reworks = reworkMapper.selectList(
+ new QueryWrapper<Rework>()
+ .eq("order_id", reportingWork.get("oldOrderId"))
+ .eq("order_sort", reportingWork.get("oldOrderNumber"))
+ .eq("review_status",0)
+ );
+ if (patchLogs.isEmpty()){
+ result.put("msg","鏃ц鍗曞瓨鍦ㄨ繑宸ユ湭瀹℃牳鏁版嵁锛岃鍏堝鏍告姤宸ュ悗鍐嶈繘琛岃浆鍑�");
+ result.put("data",false);
+ return result;
+ }
+
Map<String,Object> log = new HashMap<>();
log.put("oldOrderBeforeChange",oldOrderProcessDetailForReport);
@@ -916,6 +1016,7 @@
reportingWorkMapper.update(null,new UpdateWrapper<ReportingWork>()
.set("reviewed_state",3)
.eq("process_id",oldOrderProcessDetail.getProcessId())
+ .gt("reviewed_state",0)
);
@@ -993,7 +1094,6 @@
orderNumberTransferList.add(orderNumberTransfer);
}
-
}
}
});
@@ -1021,17 +1121,20 @@
//restTemplate.postForObject("http://localhost:8086/order/test",orderNumberTransferList,String.class);
//鍚憁es鍙戦�乭ttp璇锋眰
- ResponseEntity<String> response =restTemplate.exchange(
+ ResponseEntity<OrderNumberTransferDTO> response =restTemplate.exchange(
"http://localhost:88/api/loadGlass/order/order/orderChange",
HttpMethod.POST,
new HttpEntity<>(orderNumberTransferList),
- String.class);
+ OrderNumberTransferDTO.class);
if(response.getStatusCode() == HttpStatus.OK){
- return true;
+ OrderNumberTransferDTO responseBody = response.getBody();
+ result.put("data",true);
}else{
- return "杩炴帴mes鍝嶅簲瓒呮椂";
+ result.put("msg","杩炴帴mes鍝嶅簲瓒呮椂");
+ result.put("data",false);
}
-
+ return result;
+
}
}
--
Gitblit v1.8.0