From 24cf0b6db81cf1cad07d26c9bfbf12564681e7a3 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期一, 08 四月 2024 11:33:58 +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 | 510 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 510 insertions(+), 0 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
new file mode 100644
index 0000000..0e02dec
--- /dev/null
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java
@@ -0,0 +1,510 @@
+package com.example.erp.service.pp;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
+import com.example.erp.common.Constants;
+import com.example.erp.entity.pp.DamageDetails;
+import com.example.erp.entity.pp.FlowCard;
+import com.example.erp.entity.pp.ReportingWork;
+import com.example.erp.entity.pp.ReportingWorkDetail;
+import com.example.erp.entity.sd.Order;
+import com.example.erp.entity.sd.OrderDetail;
+import com.example.erp.entity.sd.OrderProcessDetail;
+import com.example.erp.exception.ServiceException;
+import com.example.erp.mapper.pp.*;
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.example.erp.mapper.sd.OrderMapper;
+import com.example.erp.mapper.sd.OrderProcessDetailMapper;
+import com.example.erp.service.sd.OrderProcessDetailService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.util.*;
+
+@Service
+@DS("pp")
+public class ReportingWorkService {
+ final
+ ReportingWorkMapper reportingWorkMapper;
+ final
+ BasicDateProduceMapper basicDateProduceMapper;
+ final
+ DamageDetailsMapper damageDetailsMapper;
+ final
+ OrderProcessDetailMapper orderProcessDetailMapper;
+ final
+ ReportingWorkDetailMapper
+ reportingWorkDetailMapper;
+ final OrderMapper
+ orderMapper;
+
+ final
+ FlowCardMapper flowCardMapper;
+
+ final
+ OrderProcessDetailService orderProcessDetailService;
+
+
+ public ReportingWorkService(ReportingWorkMapper reportingWorkMapper, BasicDateProduceMapper basicDateProduceMapper, DamageDetailsMapper damageDetailsMapper, ReportingWorkDetailMapper reportingWorkDetailMapper, OrderProcessDetailMapper orderProcessDetailMapper, OrderProcessDetailService orderProcessDetailService, OrderMapper orderMapper, FlowCardMapper flowCardMapper) {
+ this.reportingWorkMapper = reportingWorkMapper;
+ this.basicDateProduceMapper = basicDateProduceMapper;
+ this.damageDetailsMapper = damageDetailsMapper;
+ this.reportingWorkDetailMapper = reportingWorkDetailMapper;
+ this.orderProcessDetailMapper = orderProcessDetailMapper;
+ this.orderProcessDetailService = orderProcessDetailService;
+ this.orderMapper = orderMapper;
+ this.flowCardMapper = flowCardMapper;
+ }
+
+ public Map<String, Object> AddSelectLastWorkSv(String processIdStr, String technologyStr, String process) {
+ Map<String, Object> map = new HashMap<>();
+ //鏌ヨ娴佺▼鍗″伐鑹烘祦绋�
+ String technologicalProcess = reportingWorkMapper.SelectTechnologicalProcess(processIdStr);
+
+ //瀹氫箟-鐨勪綅缃�
+ int index = technologicalProcess.indexOf("-");
+ //鑾峰彇宸ヨ壓娴佺▼绗竴涓伐搴�
+ String interceptProcess = technologicalProcess.substring(0, index);
+ String[] processList = technologicalProcess.split("->");
+ int length = processList.length;
+
+ //瀹氫箟褰撳墠宸ュ簭涓婁笅宸ュ簭
+ String previousProcess = "";
+ String nextProcess = "";
+
+ //寰幆璇ユ祦绋嬪崱宸ヨ壓娴佺▼
+ for (int i = 0; i < length; i++) {
+ //褰撳埌褰撳墠宸ュ簭鏃�
+ if (processList[i].equals(process)) {
+ //鑾峰彇褰撳墠宸ュ簭鐨勪笂涓�閬撳伐搴�
+ if (i - 1 < 0) {
+ previousProcess = "";
+ } else {
+ previousProcess = processList[i - 1];
+ }
+ //鑾峰彇褰撳墠宸ュ簭鐨勪笅涓�閬撳伐搴�
+ if (i + 1 > length - 1) {
+ nextProcess = "";
+ } else {
+ nextProcess = processList[i + 1];
+ }
+ //鏌ヨ褰撳墠宸ュ簭鐨勮〃澶存暟鎹�
+ map.put("data", reportingWorkMapper.AddSelectLastWorkMp(processIdStr, technologyStr, previousProcess, nextProcess, process));
+ map.put("thisProcess", processList);
+ break;
+ }
+ }
+
+ //璁惧涓嬫媺妗�
+ map.put("device", reportingWorkMapper.SelectWorkBasicDeviceMp(process));
+ //鐝粍涓嬫媺妗�
+ map.put("teams", reportingWorkMapper.SelectWorkBasicTeamsMp(process));
+
+ map.put("breakageType", reportingWorkMapper.selectBasicNameByType("breakagetype"));
+ map.put("breakageReason", reportingWorkMapper.selectBasicNameByType("breakagereason"));
+
+ //鏌ヨ鏈伐搴忔姤宸ラ渶瑕佸摢鍑犲眰锛屼笂宸ュ簭鏄粈涔�
+ String obtainTechnology = reportingWorkMapper.SelectWorkTechnologyMp(processIdStr);
+
+ //鍒ゆ柇鏈伐搴忔槸涓嶆槸绗竴閬撳伐搴�
+ if (interceptProcess.equals(process)) {
+ //鏄涓�閬撳伐搴忥紝鏌ヨ娴佺▼鍗℃暟鎹�
+ map.put("Detail", reportingWorkMapper.SelectTechnologicalNumMp(processIdStr, technologyStr, process));
+ } else {
+ //涓嶆槸绗竴閬撳伐搴忥紝鏌ヨ鎶ュ伐鏁版嵁
+ map.put("Detail", reportingWorkMapper.SelectReworlDetailMp(processIdStr, technologyStr, process));
+ }
+
+ // 绗竴閬撳伐搴忥紙娴佺▼鍗℃暟+琛ョ墖鏁伴噺-瀹屽伐鏁�-娆＄牬鏁�-杩斿伐鏈畬鎴愭暟-绂佺敤鏁伴噺锛�
+
+ // 鍚庣画宸ュ簭锛堜笂宸ュ簭鎶ュ伐鏁�-瀹屽伐鏁�-娆＄牬鏁�-杩斿伐鏈畬鎴愭暟锛�
+
+ //鑾峰彇璇ユ祦绋嬪崱鍙峰巻鍙叉姤宸ュ伐搴�
+ String historyProcess = reportingWorkMapper.historyProcessMp(processIdStr);
+ //鍘嗗彶鎶ュ伐宸ュ簭璁惧
+ map.put("historyDevice", reportingWorkMapper.historyDeviceMp(historyProcess, process));
+ //鍘嗗彶鎶ュ伐宸ュ簭鐝粍
+ map.put("historyTeams", reportingWorkMapper.historyTeamsMp(processIdStr, process));
+ //鍘嗗彶宸ュ簭
+ map.put("historyProcess", reportingWorkMapper.SelectHistoryProcessMp(historyProcess, process));
+ return map;
+ }
+
+ //鏌ヨ宸ュ簭
+ public Map<String, Object> SelectProcessSv() {
+ Map<String, Object> map = new HashMap<>();
+ map.put("process", reportingWorkMapper.SelectProcessMp());
+ return map;
+ }
+
+ //鎶ュ伐鏂板
+ @Transactional(rollbackFor = Exception.class)
+ public boolean SaveReportingWorkSv(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);
+ //鑾峰彇褰撳墠鏈�澶ф姤宸ュ崟鍙风敓鎴愭姤宸ュ崟鍙�
+ String formattedNumber = String.format("%04d", reportingWorkMapper.selectMaxReportingWorkId() + 1);
+ //鏍煎紡鍖栧綋鍓嶆棩鏈�
+ Date currentDate = new Date();
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyMMdd");
+ String formattedDate = dateFormat.format(currentDate);
+ String reportingWorkId = "BG" + formattedDate + formattedNumber;
+ reportingWork.setReportingWorkId(reportingWorkId);
+ reportingWork.setProcessId(reportingWork.getProcessId().substring(0, 14));
+
+ int reviewState = (int) reportingWorkJson.get("type");
+ if (reviewState == 1) {
+ reportingWork.setReviewed(reportingWork.getCreator());
+ reportingWork.setReviewedState(1);
+ } else {
+ reportingWork.setReviewedState(0);
+ }
+ //涓昏〃鎻掑叆
+ 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);
+ damageDetail.setOrderNumber(reportingWorkDetail.getOrderNumber());
+ damageDetail.setProcessId(reportingWork.getProcessId());
+ damageDetail.setTechnologyNumber(reportingWorkDetail.getTechnologyNumber());
+ if (damageDetail.getResponsibleProcess() != reportingWork.getThisProcess()) {
+ damageDetail.setQualityInsStatus(1);
+ }
+ damageDetailsMapper.insert(damageDetail);
+ });
+ }
+ //鏌ヨ娴佺▼鍗″伐鑹烘祦绋�
+ String technologicalProcess = reportingWorkMapper.SelectTechnologicalProcess(reportingWork.getProcessId());
+
+ int index = technologicalProcess.indexOf("-");
+ //鑾峰彇宸ヨ壓娴佺▼绗竴涓伐搴�
+ String interceptProcess = technologicalProcess.substring(0, index);
+
+ //鍒ゆ柇褰撳墠宸ュ簭鏄惁涓虹涓�閬撳伐搴忓伐搴忥紝浣跨敤娴佺▼鍗¤〃鏁伴噺鎴栬�呭皬鐗囨祦绋嬭〃涓婂伐搴忔暟閲�
+ int processNum = 0;
+ if (interceptProcess.equals(reportingWork.getThisProcess())) {
+ processNum = reportingWorkMapper.selectFlowCardNum(
+ reportingWorkDetail.getOrderNumber(),
+ reportingWorkDetail.getTechnologyNumber(),
+ reportingWork.getProcessId(),
+ reportingWork.getThisProcess()
+ );
+ } else {
+ processNum = reportingWorkMapper.selectGlassProcessNum(
+ reportingWorkDetail.getOrderNumber(),
+ reportingWorkDetail.getTechnologyNumber(),
+ reportingWork.getProcessId(),
+ reportingWork.getThisProcess()
+ );
+ }
+
+
+ //鍒ゆ柇鏄惁澶т簬褰撳墠鏁伴噺骞朵笖鎶涘嚭寮傚父
+ if (processNum < (reportingWorkDetail.getBreakageQuantity() + reportingWorkDetail.getCompletedQuantity())) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("orderNumber", reportingWorkDetail.getOrderNumber());
+ map.put("technologyNumber", reportingWorkDetail.getOrderNumber());
+ map.put("processNum", processNum);
+ map.put("sumNum", reportingWorkDetail.getBreakageQuantity() + reportingWorkDetail.getCompletedQuantity());
+ String msg = JSON.toJSONString(map);
+ throw new ServiceException(Constants.Code_600, msg);
+ }
+
+ OrderProcessDetail orderProcessDetail = new OrderProcessDetail();
+ orderProcessDetail.setBrokenNum(reportingWorkDetail.getBreakageQuantity());
+ orderProcessDetail.setReportingWorkNum(reportingWorkDetail.getCompletedQuantity());
+ orderProcessDetail.setReportingWorkNumCount(reportingWorkDetail.getCompletedQuantity());
+
+ //鏍规嵁璁㈠崟id锛岃鍗曞簭鍙凤紝浠ュ強灏忕墖搴忓彿 鏇存柊灏忕墖娴佺▼鐨勫畬宸ユ暟閲忎互鍙婂埡鐮存暟閲�
+ LambdaUpdateWrapper<OrderProcessDetail> updateWrapper = new LambdaUpdateWrapper<>();
+ updateWrapper.eq(OrderProcessDetail::getOrderNumber, reportingWorkDetail.getOrderNumber())
+ .eq(OrderProcessDetail::getProcessId, reportingWork.getProcessId().substring(0, 14))
+ .eq(OrderProcessDetail::getOrderId, reportingWork.getOrderId())
+ .eq(OrderProcessDetail::getProcess, reportingWork.getThisProcess())
+ .eq(OrderProcessDetail::getTechnologyNumber, reportingWorkDetail.getTechnologyNumber())
+ .setSql("reporting_work_num_count = reporting_work_num_count +" + orderProcessDetail.getReportingWorkNum())
+ .setSql("reporting_work_num =reporting_work_num +" + orderProcessDetail.getReportingWorkNum())
+ .setSql("broken_num =broken_num +" + orderProcessDetail.getBrokenNum());
+ orderProcessDetailMapper.update(null, updateWrapper);
+
+ //鍒ゆ柇瀹屽伐鏁伴噺鍜屽埡鐮存暟閲忔槸鍚︿负0锛屼负0鍒欎笉鎻掑叆鍒版暟鎹簱
+ if (!(reportingWorkDetail.getCompletedQuantity() == 0 && reportingWorkDetail.getBreakageQuantity() == 0)) {
+ reportingWorkDetailMapper.insert(reportingWorkDetail);
+ }
+
+ //鏇存柊娴佺▼鍗¤〃鐨勬姤宸ユ暟閲�
+ if (Objects.equals(reportingWork.getNextProcess(), "")) {
+ LambdaUpdateWrapper<FlowCard> flowCardLambdaUpdateWrapper =
+ new LambdaUpdateWrapper<>();
+ flowCardLambdaUpdateWrapper
+ .eq(FlowCard::getProcessId, reportingWork.getProcessId())
+ .eq(FlowCard::getOrderNumber, reportingWorkDetail.getOrderNumber())
+ .eq(FlowCard::getTechnologyNumber, reportingWorkDetail.getTechnologyNumber())
+ .setSql("inventory_quantity = inventory_quantity +" + orderProcessDetail.getReportingWorkNum());
+ flowCardMapper.update(null, flowCardLambdaUpdateWrapper);
+ }
+
+
+ });
+
+ return true;
+ }
+
+ //涓嬪伐搴忓鏍告柟娉�
+ public boolean ReviewReportingWorkSv(Map<String, String> reportingWork) {
+
+ String processId = reportingWork.get("processId");
+
+ LambdaUpdateWrapper
+ <ReportingWork> updateWrapper = new LambdaUpdateWrapper<>();
+ updateWrapper
+ .eq(ReportingWork::getProcessId, processId.substring(0, 14))
+ .eq(ReportingWork::getThisProcess, reportingWork.get("process"))
+ .eq(ReportingWork::getReviewedState, 0)
+ .setSql("reviewed_state =1");
+ reportingWorkMapper.update(null, updateWrapper);
+
+
+ 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<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, String reviewState) {
+ //鎺ユ敹瑙ｆ瀽涓婚檮琛ㄤ俊鎭�
+ 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(damageDetail -> {
+ if (!Objects.equals(reportingWork.getThisProcess(), damageDetail.getResponsibleProcess())) {
+ damageDetail.setQualityInsStatus(1);
+ }
+ if (Objects.equals(reviewState, "review")) {
+ damageDetail.setQualityInsStatus(2);
+ }
+
+ damageDetailsMapper.insert(damageDetail);
+ });
+ }
+ //鎻掑叆鎶ュ伐鏁版嵁
+ reportingWorkDetailMapper.insert(reportingWorkDetail);
+ });
+ //鑾峰彇璐ㄦ鏃堕棿
+ if (Objects.equals(reviewState, "review")) {
+ LocalDateTime
+ currentDate = LocalDateTime.now();
+ reportingWork.setQualityInsTime(currentDate);
+ reportingWorkMapper.updateById(reportingWork);
+ }
+
+ //淇敼灏忕墖娴佺▼琛ㄦ暟閲忎负鎶ュ伐鏄庣粏琛ㄦ暟閲�
+ orderProcessDetailMapper.updateQuantity(reportingWork.getReportingWorkId(), reportingWork.getThisProcess(), "add");
+ return true;
+ }
+
+ //鎶ュ伐绠＄悊鏌ヨ
+ public Map<String, Object> selectReportingWorkSv(Integer pageNum, Integer pageSize, java.sql.Date selectTime1, java.sql.Date selectTime2, String orderId, ReportingWork reportingWork) {
+ Integer offset = (pageNum - 1) * pageSize;
+ if ("null".equals(orderId)) {
+ orderId = "";
+ }
+ Map<String, Object> map = new HashMap<>();
+ map.put("data", reportingWorkMapper.selectReportingWorkMp(offset, pageSize, selectTime1, selectTime2, orderId, reportingWork));
+ map.put("total", reportingWorkMapper.getPageTotal(offset, pageSize, selectTime1, selectTime2, orderId, reportingWork));
+ return map;
+ }
+
+ //鍒犻櫎鎶ュ伐
+ public Boolean deleteWorkSv(String reportingWorkId, String processId, String thisProcess) {
+ if (!reportingWorkId.isEmpty() && !processId.isEmpty() && !thisProcess.isEmpty()) {
+ //鑾峰彇褰撳墠鎶ュ伐缂栧彿涓嬪伐搴�
+ String nextProcess = reportingWorkMapper.selectNextProcess(reportingWorkId);
+ //鏌ヨ褰撳墠鎶ュ伐缂栧彿涓嬪伐搴忔槸鍚︽姤宸�
+ Integer count = reportingWorkMapper.selectCountByProcessId(processId, nextProcess);
+ //鑾峰彇鏈�鍚庝竴閬撳伐搴�
+ String lastProcess = reportingWorkMapper.selectLastProcess(processId);
+ //鍒ゆ柇鏄惁鏄叆搴撳伐搴�
+ if (lastProcess.equals(thisProcess)) {//鏄叆搴撳伐搴�
+ //鏌ヨ璇ユ祦绋嬪崱鏁伴噺銆佸彲鍏ュ簱鏁伴噺銆佸凡鍏ュ簱鏁伴噺
+ Map<String, Object> list = reportingWorkMapper.selectReceiptQuantity(processId);
+ if (list.get("quantity") == list.get("receiptQuantity")) {
+ return false;
+ } else {
+ //杞崲绫诲瀷:宸插叆搴撴暟閲�
+ Integer receiptQuantity = Integer.parseInt(list.get("receivedQuantity").toString());
+ //杞崲绫诲瀷:鍙叆搴撴暟閲�
+ Integer inventoryQuantity = Integer.parseInt(list.get("inventoryQuantity").toString());
+ //鏌ヨ璇ユ姤宸ョ紪鍙锋湰宸ュ簭瀹屽伐鏁伴噺
+ Integer completedQuantity = reportingWorkMapper.selectCompletedQuantity(reportingWorkId);
+ //褰撹宸ュ簭瀹屽伐鏁伴噺灏忎簬绛変簬宸插叆搴撴暟閲忔椂
+ //鍙叆搴撴暟閲�-宸插叆搴撴暟閲�>=鎶ュ伐缂栧彿鏈伐搴忓畬宸ユ暟閲�
+ if (inventoryQuantity - receiptQuantity >= completedQuantity) {
+ //鏌ヨ褰撳墠鎶ュ伐缂栧彿瀹屽伐娆＄牬鏁伴噺鐨勬暟鎹�
+ List<Map<String, Object>> workDateList = reportingWorkMapper.reportingWorkDate(reportingWorkId);
+ for (Map<String, Object> item : workDateList) {
+ //鏇存柊娴佺▼鍗″彲鍏ュ簱鏁伴噺
+ reportingWorkMapper.updateInventoryQuantity(processId, item.get("order_number"), item.get("technology_number"), item.get("completed_quantity"));
+ //鏇存柊鎶ュ伐娴佺▼琛ㄦ暟鎹�
+ reportingWorkMapper.updateWorkProcess(processId, item.get("order_number"), item.get("technology_number"), item.get("completed_quantity"), item.get("breakage_quantity"), thisProcess);
+ }
+ //鍒犻櫎鎶ュ伐锛屽皢瀹℃牳鐘舵�佹敼涓�-1
+ reportingWorkMapper.deleteWork(reportingWorkId);
+ return true;
+ } else {
+ return false;
+ }
+ }
+
+ } else {//涓嶆槸鍏ュ簱宸ュ簭
+ if (count == 0) {
+ //鏌ヨ褰撳墠鎶ュ伐缂栧彿瀹屽伐娆＄牬鏁伴噺鐨勬暟鎹�
+ List<Map<String, Object>> workDateList = reportingWorkMapper.reportingWorkDate(reportingWorkId);
+ for (Map<String, Object> item : workDateList) {
+ //鏇存柊鎶ュ伐娴佺▼琛ㄦ暟鎹�
+ reportingWorkMapper.updateWorkProcess(processId, item.get("order_number"), item.get("technology_number"), item.get("completed_quantity"), item.get("breakage_quantity"), thisProcess);
+ }
+ //鍒犻櫎鎶ュ伐锛屽皢瀹℃牳鐘舵�佹敼涓�-1
+ reportingWorkMapper.deleteWork(reportingWorkId);
+ return true;
+ } else {
+ return false;
+ }
+ }
+
+
+ } else {
+ return false;
+ }
+ }
+
+ //鏌ヨ璐ㄦ瀹℃牳
+ public Map<String, Object> selectQualityTestingSv(Integer pageNum, Integer pageSize, java.sql.Date selectTime1, java.sql.Date selectTime2, Integer state, String processId, ReportingWork reportingWork) {
+ Integer offset = (pageNum - 1) * pageSize;
+ if ("null".equals(processId)) {
+ processId = "";
+ }
+ Map<String, Object> map = new HashMap<>();
+ map.put("data", reportingWorkMapper.selectQualityTestingMp(offset, pageSize, selectTime1, selectTime2, state, processId, reportingWork));
+ map.put("total", reportingWorkMapper.getQualityPageTotal(offset, pageSize, selectTime1, selectTime2, state, processId, reportingWork));
+
+ return map;
+ }
+
+ //淇敼璐ㄦ瀹℃牳鐘舵��
+ public Boolean updateQualityStatusSv(String reportingWorkId, String username) {
+ if (!reportingWorkId.isEmpty()) {
+ reportingWorkMapper.updateQualityStatusMp(reportingWorkId, username);
+ return true;
+ } else {
+ return false;
+ }
+ }
+
+ //鏌ヨ璐ㄦ鏄庣粏锛堟湭浣跨敤锛�
+ public Map<String, Object> detailsQualitySv(String reportingWorkId, String processId, String thisProcess, ReportingWork reportingWork) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("data", reportingWorkMapper.detailsQualityMp(reportingWorkId, reportingWork));
+ map.put("basic", getReportingWorkBase(processId, thisProcess));
+
+ return map;
+ }
+}
--
Gitblit v1.8.0