From 1175097e7c6a7fcb9aed0a46aad691450f898d97 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期四, 14 三月 2024 16:53:58 +0800
Subject: [PATCH] 提交报工相关文件
---
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java | 89 +++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 87 insertions(+), 2 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 9e5daf6..178461f 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
@@ -174,11 +174,21 @@
}
//涓昏〃鎻掑叆
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());
+
+
reportingWorkDetail.setReportingWorkId(reportingWorkId);
List<DamageDetails> damageDetails = reportingWorkDetail.getDamageDetails();
+ //娆＄牬鏄庣粏琛ㄦ彃鍏ユ暟鎹�
if(damageDetails!=null && !damageDetails.isEmpty()){
damageDetails.forEach(damageDetail ->{
damageDetail.setReportingWorkId(reportingWorkId);
@@ -256,6 +266,7 @@
});
+
return true;
}
@@ -277,21 +288,95 @@
return true;
}
+ //鎶ュ伐淇敼鏌ヨ
public Map<String,Object> selectUpdateReportingWorkSv(String reportingWorkId) {
+ //鏌ヨ鎶ュ伐涓昏〃淇℃伅
ReportingWork reportingWork =reportingWorkMapper.selectOne(new LambdaQueryWrapper<ReportingWork>()
.eq(ReportingWork::getReportingWorkId,reportingWorkId));
+ //鏍规嵁鎶ュ伐淇℃伅鏌ヨ璁㈠崟涓昏〃淇℃伅
reportingWork.setOrder(
orderMapper.selectOne(new LambdaQueryWrapper<Order>()
.eq(Order::getOrderId,reportingWork.getOrderId())));
reportingWork.setFlowCard(new FlowCard());
- List<ReportingWorkDetail> reportingWorkDetails = reportingWorkDetailMapper.selectByreportingWorkId(reportingWorkId);
+ List<Map<String,Object>> reportingWorkDetails = reportingWorkMapper.selectByReportingWorkId(reportingWorkId,reportingWork.getNextProcess());
+ reportingWorkDetails.forEach(reportingWorkDetail ->{
+ List<DamageDetails> damageDetailsList = new ArrayList<>();
+ damageDetailsList = damageDetailsMapper.selectList(new LambdaQueryWrapper<DamageDetails>()
+ .eq(DamageDetails::getReportingWorkId,reportingWorkId)
+ .eq(DamageDetails::getOrderNumber,reportingWorkDetail.get("order_number"))
+ .eq(DamageDetails::getTechnologyNumber,reportingWorkDetail.get("technology_number"))
+ );
+ reportingWorkDetail.put("damageDetails",damageDetailsList);
+ });
Map<String,Object> map = new HashMap<>();
map.put("reportingWork",reportingWork);
map.put("reportingWorkDetails",reportingWorkDetails);
+ map.put("basic",getReportingWorkBase(reportingWork.getProcessId(),reportingWork.getThisProcess()));
+
+
+
return map;
}
+
+ private Map<String,Object> getReportingWorkBase(String processId, String thisProcess) {
+ Map<String,Object> map = new HashMap<>();
+ //璁惧涓嬫媺妗�
+ map.put("deviceType", reportingWorkMapper.SelectWorkBasicDeviceMp(thisProcess));
+ //鐝粍涓嬫媺妗�
+ map.put("teamsType", reportingWorkMapper.SelectWorkBasicTeamsMp(thisProcess));
+
+ map.put("breakageType",reportingWorkMapper.selectBasicNameByType("breakagetype"));
+ map.put("breakageReason",reportingWorkMapper.selectBasicNameByType("breakagereason"));
+
+ //鑾峰彇璇ユ祦绋嬪崱鍙峰巻鍙叉姤宸ュ伐搴�
+ String historyProcess =reportingWorkMapper.historyProcessMp(processId);
+ //鍘嗗彶鎶ュ伐宸ュ簭璁惧
+ map.put("historyDevice",reportingWorkMapper.historyDeviceMp(historyProcess,thisProcess));
+ //鍘嗗彶鎶ュ伐宸ュ簭鐝粍
+ map.put("historyTeams",reportingWorkMapper.historyTeamsMp(processId,thisProcess));
+ //鍘嗗彶宸ュ簭
+ map.put("historyProcess",reportingWorkMapper.SelectHistoryProcessMp(historyProcess,thisProcess));
+
+ return map;
+ }
+
+
+ @Transactional
+ //鎶ュ伐淇敼
+ public Boolean updateReportingWork(Map<String, Object> reportingWorkMap) {
+ //鎺ユ敹瑙ｆ瀽涓婚檮琛ㄤ俊鎭�
+ JSONObject reportingWorkJson = new JSONObject(reportingWorkMap);
+ ReportingWork reportingWork = JSONObject.parseObject(JSONObject.toJSONString(reportingWorkJson.get("title")), ReportingWork.class);
+ List<ReportingWorkDetail> reportingWorkDetails = JSONArray.parseArray(JSONObject.toJSONString(reportingWorkJson.get("detail")), ReportingWorkDetail.class);
+ //鍒犻櫎鍒虹牬鏄庣粏琛ㄥ埡鐮存暟鎹�
+ damageDetailsMapper.delete(
+ new LambdaQueryWrapper<DamageDetails>()
+ .eq(DamageDetails::getReportingWorkId,reportingWork.getReportingWorkId())
+ );
+ //淇敼灏忕墖娴佺▼琛ㄦ暟閲�
+ orderProcessDetailMapper.updateQuantity(reportingWork.getReportingWorkId(),reportingWork.getThisProcess(),"delete");
+ //鍒犻櫎鎶ュ伐鏄庣粏琛ㄦ暟鎹�
+ reportingWorkDetailMapper
+ .delete(new LambdaQueryWrapper<ReportingWorkDetail>()
+ .eq(ReportingWorkDetail::getReportingWorkId,reportingWork.getReportingWorkId()));
+
+ //鏇寸粏鎶ュ伐涓昏〃
+ reportingWorkMapper.updateById(reportingWork);
+ reportingWorkDetails.forEach(reportingWorkDetail->{
+ List<DamageDetails> damageDetails = reportingWorkDetail.getDamageDetails();
+ //姣忎竴鏉℃姤宸ユ暟鎹惊鐜彃鍏ユ鐮存槑缁嗚〃
+ if(damageDetails!=null && !damageDetails.isEmpty()){
+ damageDetails.forEach(damageDetailsMapper::insert);
+ }
+ //鎻掑叆鎶ュ伐鏁版嵁
+ reportingWorkDetailMapper.insert(reportingWorkDetail);
+ });
+ //淇敼灏忕墖娴佺▼琛ㄦ暟閲忎负鎶ュ伐鏄庣粏琛ㄦ暟閲�
+ orderProcessDetailMapper.updateQuantity(reportingWork.getReportingWorkId(),reportingWork.getThisProcess(),"add");
+ return true;
+ }
}
--
Gitblit v1.8.0