From 2495a8e1f71b6a0908a423765aaafd9ae0140d0c Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 11 三月 2026 15:21:53 +0800
Subject: [PATCH] 生成生产订单与生产计划关联表
---
src/main/java/com/ruoyi/productionPlan/service/impl/ProductionPlanServiceImpl.java | 543 ++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 423 insertions(+), 120 deletions(-)
diff --git a/src/main/java/com/ruoyi/productionPlan/service/impl/ProductionPlanServiceImpl.java b/src/main/java/com/ruoyi/productionPlan/service/impl/ProductionPlanServiceImpl.java
index 9911a70..cb916e9 100644
--- a/src/main/java/com/ruoyi/productionPlan/service/impl/ProductionPlanServiceImpl.java
+++ b/src/main/java/com/ruoyi/productionPlan/service/impl/ProductionPlanServiceImpl.java
@@ -3,29 +3,45 @@
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.common.utils.http.HttpUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.config.AliDingConfig;
+import com.ruoyi.production.pojo.ProductOrder;
+import com.ruoyi.production.service.ProductOrderService;
import com.ruoyi.productionPlan.dto.ProductionPlanDto;
+import com.ruoyi.productionPlan.dto.ProductionPlanImportDto;
+import com.ruoyi.productionPlan.dto.ProductionPlanSummaryDto;
+import com.ruoyi.productionPlan.mapper.ProductOrderPlanMapper;
import com.ruoyi.productionPlan.mapper.ProductionPlanMapper;
+import com.ruoyi.productionPlan.pojo.ProductOrderPlan;
import com.ruoyi.productionPlan.pojo.ProductionPlan;
import com.ruoyi.productionPlan.service.ProductionPlanService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
+import javax.servlet.http.HttpServletResponse;
+import java.math.BigDecimal;
import java.nio.charset.StandardCharsets;
-import java.time.Instant;
-import java.time.LocalDateTime;
-import java.time.OffsetDateTime;
-import java.time.ZoneId;
+import java.time.*;
+import java.time.format.DateTimeFormatter;
import java.time.format.DateTimeParseException;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
+import java.util.concurrent.locks.ReentrantLock;
+import java.util.stream.Collectors;
+
+import static com.ruoyi.productionPlan.enums.DataSourceTypeEnum.PRODUCTION_FORECAST;
/**
* <br>
@@ -46,6 +62,17 @@
@Autowired
private ProductionPlanMapper productionPlanMapper;
+
+ @Autowired
+ private ProductOrderService productOrderService;
+
+ @Autowired
+ private ProductOrderPlanMapper productOrderPlanMapper;
+
+ /**
+ * 鍚屾閿侊紝纭繚鎵嬪姩鍜屽畾鏃朵换鍔′笉鍚屾椂鎵ц
+ */
+ private final ReentrantLock syncLock = new ReentrantLock();
@Override
public IPage<ProductionPlanDto> listPage(Page page, ProductionPlanDto productionPlanDto) {
@@ -69,151 +96,369 @@
}
/**
+ * 鍚堝苟鐢熶骇璁″垝
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean combine(ProductionPlanDto productionPlanDto) {
+ if (productionPlanDto.getIds() == null || productionPlanDto.getIds().isEmpty()) {
+ return false;
+ }
+
+ // 鏌ヨ涓荤敓浜ц鍒�
+ List<ProductionPlan> plans = productionPlanMapper.selectBatchIds(productionPlanDto.getIds());
+
+ // 鏍￠獙鏄惁瀛樺湪涓嶅悓鐨勪骇鍝佸悕绉�
+ String firstProductName = plans.get(0).getProductName();
+ if (plans.stream().anyMatch(p -> !p.getProductName().equals(firstProductName))) {
+ throw new BaseException("鍚堝苟澶辫触锛屽瓨鍦ㄤ笉鍚岀殑浜у搧鍚嶇О");
+ }
+
+ // 鏍￠獙鏄惁瀛樺湪涓嶅悓鐨勪骇鍝佽鏍�
+ String firstProductSpec = plans.get(0).getProductSpec();
+ if (plans.stream().anyMatch(p -> !p.getProductSpec().equals(firstProductSpec))) {
+ throw new BaseException("鍚堝苟澶辫触锛屽瓨鍦ㄤ笉鍚岀殑浜у搧瑙勬牸");
+ }
+
+
+ // 鍙犲姞鏂规暟
+ BigDecimal totalVolume = plans.stream()
+ .map(ProductionPlan::getVolume)
+ .filter(v -> v != null)
+ .reduce(BigDecimal.ZERO, BigDecimal::add);
+ // 鍒ゆ柇涓嬪彂鏁伴噺鏄惁澶т簬绛変簬鏂规暟
+ if (productionPlanDto.getTotalAssignedQuantity().compareTo(totalVolume) > 0) {
+
+ log.warn("鎿嶄綔澶辫触锛屼笅鍙戞暟閲忎笉鑳藉ぇ浜庢柟鏁�");
+ return false;
+ }
+
+ // 鏍规嵁涓嬪彂鏁伴噺锛屼粠绗竴涓敓浜ц鍒掑紑濮嬪垎閰嶆柟鏁�
+ BigDecimal assignedVolume = BigDecimal.ZERO;
+ for (ProductionPlan plan : plans) {
+ BigDecimal volume = plan.getVolume();
+ if (volume == null) {
+ continue;
+ }
+
+ if (assignedVolume.add(volume).compareTo(productionPlanDto.getTotalAssignedQuantity()) >= 0) {
+ // 鏈�鍚庝竴涓鍒掞紝鍒嗛厤鍓╀綑鏂规暟
+ plan.setAssignedQuantity(productionPlanDto.getTotalAssignedQuantity().subtract(assignedVolume));
+ productionPlanMapper.updateById(plan);
+ break;
+ }
+
+ // 鍒嗛厤褰撳墠璁″垝鏂规暟
+ plan.setAssignedQuantity(volume);
+ productionPlanMapper.updateById(plan);
+ assignedVolume = assignedVolume.add(volume);
+ }
+
+ // 鍒涘缓鐢熶骇璁㈠崟
+ ProductOrder productOrder = new ProductOrder();
+ productOrder.setQuantity(productionPlanDto.getTotalAssignedQuantity());
+ productOrder.setPlanCompleteTime(productionPlanDto.getPlanCompleteTime());
+ productOrderService.addProductOrder(productOrder);
+
+ for (Long planId : productionPlanDto.getIds()) {
+ ProductOrderPlan productOrderPlan = new ProductOrderPlan();
+ productOrderPlan.setProductOrderId(productOrder.getId());
+ productOrderPlan.setProductionPlanId(planId);
+ productOrderPlanMapper.insert(productOrderPlan);
+ }
+ return true;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean add(ProductionPlanDto productionPlanDto) {
+ productionPlanDto.setDataSourceType(PRODUCTION_FORECAST.getCode());
+ productionPlanMapper.insert(productionPlanDto);
+ return true;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean update(ProductionPlanDto productionPlanDto) {
+ // 鏌ヨ鏄惁鏈夊叧鑱旇鍗�
+ boolean hasProductOrderPlan = productOrderPlanMapper.selectList(Wrappers.<ProductOrderPlan>lambdaQuery().eq(ProductOrderPlan::getProductionPlanId, productionPlanDto.getId())).stream().anyMatch(p -> p.getProductOrderId() != null);
+ if (hasProductOrderPlan) {
+ // 濡傛灉鍏宠仈锛屾柟鏁板彧鑳介�掑
+ ProductionPlan currentPlan = productionPlanMapper.selectById(productionPlanDto.getId());
+ if (productionPlanDto.getVolume().compareTo(currentPlan.getVolume()) < 0) {
+ throw new BaseException("鏂规暟涓嶈兘閫掑噺");
+ }
+ }
+
+ return productionPlanMapper.updateById(productionPlanDto) > 0;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean delete(List<Long> ids) {
+ // 濡傛灉鏈夊叧鑱旇鍗曪紝鍒欎笉鑳藉垹闄�
+ if (productOrderPlanMapper.selectList(Wrappers.<ProductOrderPlan>lambdaQuery().in(ProductOrderPlan::getProductionPlanId, ids)).stream().anyMatch(p -> p.getProductOrderId() != null)) {
+ throw new BaseException("鍒犻櫎澶辫触锛屽瓨鍦ㄥ叧鑱旇鍗�");
+ }
+
+ return productionPlanMapper.deleteBatchIds(ids) > 0;
+ }
+
+ /**
* 鍚屾鏁版嵁
*/
@Transactional(rollbackFor = Exception.class)
public void syncProdData(Integer dataSyncType) {
+ if (!syncLock.tryLock()) {
+ log.warn("鍚屾姝ｅ湪杩涜涓紝鏈 {} 鍚屾璇锋眰琚烦杩�", dataSyncType == 1 ? "鎵嬪姩" : "瀹氭椂浠诲姟");
+ return;
+ }
+
try {
- // 鑾峰彇AccessToken
- String params = "appkey=" + aliDingConfig.getAppKey()
- + "&appsecret=" + aliDingConfig.getAppSecret();
-
- String tokenRes = HttpUtils.sendGet(aliDingConfig.getAccessTokenUrl(), params);
-
- JSONObject tokenObj = JSON.parseObject(tokenRes);
-
- String accessToken = tokenObj.getString("access_token");
+ // 鑾峰彇 AccessToken
+ String accessToken = getAccessToken();
if (StringUtils.isEmpty(accessToken)) {
- log.error("鑾峰彇閽夐拤AccessToken澶辫触: {}", tokenRes);
return;
}
- log.info("鑾峰彇AccessToken鎴愬姛: {}", accessToken);
+ // 鑾峰彇鏈湴鏈�鍚庡悓姝ユ椂闂�
+ LocalDateTime lastSyncTime = getLastSyncTime();
+ log.info("寮�濮嬪閲忓悓姝ワ紝鏈湴鏈�鍚庝慨鏀规椂闂�: {}", lastSyncTime);
- // 鏌ヨ琛ㄥ崟鏁版嵁
- JSONObject searchParam = new JSONObject();
- searchParam.put("appType", aliDingConfig.getAppType());
- searchParam.put("systemToken", aliDingConfig.getSystemToken());
- searchParam.put("userId", aliDingConfig.getUserId());
- searchParam.put("formUuid", aliDingConfig.getFormUuid());
+ int pageNumber = 1;
+ int pageSize = 50;
+ boolean hasMore = true;
+ int totalSynced = 0;
- String dataRes = HttpUtils.sendPostJson(
- aliDingConfig.getSearchFormDataUrl(),
- searchParam.toJSONString(),
- StandardCharsets.UTF_8.name(),
- null,
- accessToken
- );
+ while (hasMore) {
+ // 鏌ヨ鍙傛暟
+ JSONObject searchParam = buildSearchParam(lastSyncTime, pageNumber, pageSize);
- if (StringUtils.isEmpty(dataRes)) {
- log.error("鎷夊彇瀹滄惌鏁版嵁涓虹┖");
- return;
- }
+ // 璋冪敤瀹滄惌鎺ュ彛鎷夊彇鏁版嵁
+ String dataRes = HttpUtils.sendPostJson(
+ aliDingConfig.getSearchFormDataUrl(),
+ searchParam.toJSONString(),
+ StandardCharsets.UTF_8.name(),
+ null,
+ accessToken
+ );
- JSONObject resultObj = JSON.parseObject(dataRes);
- JSONArray dataArr = resultObj.getJSONArray("data");
-
- if (dataArr == null || dataArr.isEmpty()) {
- log.warn("娌℃湁鑾峰彇鍒拌〃鍗曟暟鎹�");
- return;
- }
-
- List<ProductionPlan> list = new ArrayList<>();
-
- // 瑙ｆ瀽琛ㄥ崟
- for (int i = 0; i < dataArr.size(); i++) {
-
- JSONObject item = dataArr.getJSONObject(i);
-
- String formInstanceId = item.getString("formInstanceId");
- String serialNo = item.getString("serialNo");
- // 鍙戣捣浜�
- JSONObject originator = item.getJSONObject("originator");
- String originatorName = originator.getJSONObject("userName").getString("nameInChinese");
-
- JSONObject formData = item.getJSONObject("formData");
- // 鏄庣粏琛�
- JSONArray tableArr = formData.getJSONArray("tableField_l7fytfcn");
- if (tableArr == null || tableArr.isEmpty()) {
- continue;
+ if (StringUtils.isEmpty(dataRes)) {
+ log.warn("绗� {} 椤垫媺鍙栨暟鎹负绌�", pageNumber);
+ break;
}
- // 瑙ｆ瀽鏄庣粏
- for (int j = 0; j < tableArr.size(); j++) {
- JSONObject row = tableArr.getJSONObject(j);
- ProductionPlan plan = new ProductionPlan();
+ JSONObject resultObj = JSON.parseObject(dataRes);
+ JSONArray dataArr = resultObj.getJSONArray("data");
+ Integer totalCount = resultObj.getInteger("totalCount");
- // 琛ㄥ崟淇℃伅
- plan.setFormInstanceId(formInstanceId);
- plan.setSerialNo(serialNo);
+ if (dataArr == null || dataArr.isEmpty()) {
+ log.info("娌℃湁鏇村鏂版暟鎹渶瑕佸悓姝�");
+ break;
+ }
- // 琛ㄥご瀛楁
- plan.setApplyNo(formData.getString("textField_l7fytfco"));
- plan.setCustomerName(formData.getString("textField_lbkozohg"));
+ // 瑙ｆ瀽骞朵繚瀛樻暟鎹�
+ List<ProductionPlan> list = parseProductionPlans(dataArr, dataSyncType, totalCount);
+ if (!list.isEmpty()) {
+ // 澶勭悊鏇存柊鎴栨柊澧�
+ int affected = processSaveOrUpdate(list);
+ totalSynced += affected;
+ }
- // 鏄庣粏瀛楁
- plan.setMaterialCode(row.getString("textField_l9xo62q5"));
- plan.setProductName(row.getString("textField_l9xo62q7"));
- plan.setProductSpec(row.getString("textField_l9xo62q8"));
- plan.setLength(row.getInteger("numberField_lb7lgatg_value"));
- plan.setWidth(row.getInteger("numberField_lb7lgath_value"));
- plan.setHeight(row.getInteger("numberField_lb7lgati_value"));
- plan.setQuantity(row.getInteger("numberField_lb7lgatj_value"));
- plan.setVolume(row.getBigDecimal("numberField_l7fytfd3_value"));
- plan.setStrength(row.getString("radioField_m9urarr2_id"));
+ // 鍒ゆ柇鏄惁杩樻湁涓嬩竴椤�
+ hasMore = (pageNumber * pageSize) < totalCount;
+ pageNumber++;
- // 鏃ユ湡鍖洪棿
- JSONArray dateArr = row.getJSONArray("cascadeDateField_lfxqqluw");
+ log.info("姝ｅ湪鍚屾绗� {} 椤碉紝褰撳墠宸插悓姝� {}/{}", pageNumber - 1, totalSynced, totalCount);
+ }
- if (dateArr != null && dateArr.size() == 2) {
+ log.info("鏁版嵁鍚屾瀹屾垚锛屽叡鍚屾 {} 鏉℃暟鎹�", totalSynced);
+ } catch (Exception e) {
+ log.error("鍚屾鐢熶骇璁″垝寮傚父", e);
+ } finally {
+ // 閲婃斁閿�
+ syncLock.unlock();
+ }
+ }
+
+ private String getAccessToken() {
+ String params = "appkey=" + aliDingConfig.getAppKey()
+ + "&appsecret=" + aliDingConfig.getAppSecret();
+ String tokenRes = HttpUtils.sendGet(aliDingConfig.getAccessTokenUrl(), params);
+ JSONObject tokenObj = JSON.parseObject(tokenRes);
+ String accessToken = tokenObj.getString("access_token");
+ if (StringUtils.isEmpty(accessToken)) {
+ log.error("鑾峰彇閽夐拤AccessToken澶辫触: {}", tokenRes);
+ }
+ return accessToken;
+ }
+
+ private LocalDateTime getLastSyncTime() {
+ // 鏌ヨ鏈湴鏁版嵁搴撲腑 formModifiedTime 鏈�澶х殑璁板綍
+ LambdaQueryWrapper<ProductionPlan> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.orderByDesc(ProductionPlan::getFormModifiedTime).last("LIMIT 1");
+ ProductionPlan lastRecord = this.getOne(queryWrapper);
+ return lastRecord != null ? lastRecord.getFormModifiedTime() : null;
+ }
+
+ private JSONObject buildSearchParam(LocalDateTime lastSyncTime, int pageNumber, int pageSize) {
+ JSONObject searchParam = new JSONObject();
+ searchParam.put("appType", aliDingConfig.getAppType());
+ searchParam.put("systemToken", aliDingConfig.getSystemToken());
+ searchParam.put("userId", aliDingConfig.getUserId());
+ searchParam.put("formUuid", aliDingConfig.getFormUuid());
+ searchParam.put("pageSize", pageSize);
+ searchParam.put("pageNumber", pageNumber);
+
+ // 榛樿鎸変慨鏀规椂闂村崌搴忔帓搴忥紝纭繚鍒嗛〉鎷夊彇鏁版嵁鐨勮繛缁��
+ // "+" 琛ㄧず鍗囧簭锛�"gmt_modified" 鏄畼鏂瑰唴缃瓧娈�
+ searchParam.put("orderConfigJson", "{\"gmt_modified\":\"+\"}");
+
+ // 璁剧疆淇敼鏃堕棿绛涢�夊尯闂� (鏍煎紡蹇呴』涓簓yyy-MM-dd HH:mm:ss)
+ if (lastSyncTime != null) {
+ // 璧峰鏃堕棿锛氫笂娆″悓姝ュ埌鐨勬渶鍚庝竴鏉℃暟鎹殑淇敼鏃堕棿
+ String startTime = lastSyncTime.plusSeconds(1).atZone(ZoneId.systemDefault())
+ .format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+ searchParam.put("modifiedFromTimeGMT", startTime);
+ }
+
+ // 鎴鏃堕棿锛氬綋鍓嶆椂闂达紝纭繚鑾峰彇鏈�鏂扮殑宸蹭慨鏀�/宸叉柊澧炴暟鎹�
+ String endTime = LocalDateTime.now().atZone(ZoneId.systemDefault())
+ .format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+ searchParam.put("modifiedToTimeGMT", endTime);
+
+ return searchParam;
+ }
+
+ private List<ProductionPlan> parseProductionPlans(JSONArray dataArr, Integer dataSyncType, Integer totalCount) {
+ List<ProductionPlan> list = new ArrayList<>();
+ LocalDateTime now = LocalDateTime.now();
+
+ for (int i = 0; i < dataArr.size(); i++) {
+ JSONObject item = dataArr.getJSONObject(i);
+ String formInstanceId = item.getString("formInstanceId");
+ String serialNo = item.getString("serialNo");
+
+ JSONObject originator = item.getJSONObject("originator");
+ String originatorName = originator != null && originator.containsKey("userName")
+ ? originator.getJSONObject("userName").getString("nameInChinese") : "鏈煡";
+
+ JSONObject formData = item.getJSONObject("formData");
+ JSONArray tableArr = formData.getJSONArray("tableField_l7fytfcn");
+ if (tableArr == null || tableArr.isEmpty()) {
+ continue;
+ }
+
+ for (int j = 0; j < tableArr.size(); j++) {
+ JSONObject row = tableArr.getJSONObject(j);
+ ProductionPlan plan = new ProductionPlan();
+
+ plan.setFormInstanceId(formInstanceId);
+ plan.setSerialNo(serialNo);
+ plan.setApplyNo(formData.getString("textField_l7fytfco"));
+ plan.setCustomerName(formData.getString("textField_lbkozohg"));
+
+ plan.setMaterialCode(row.getString("textField_l9xo62q5"));
+ plan.setProductName(row.getString("textField_l9xo62q7"));
+ plan.setProductSpec(row.getString("textField_l9xo62q8"));
+ plan.setLength(row.getInteger("numberField_lb7lgatg_value"));
+ plan.setWidth(row.getInteger("numberField_lb7lgath_value"));
+ plan.setHeight(row.getInteger("numberField_lb7lgati_value"));
+ plan.setQuantity(row.getInteger("numberField_lb7lgatj_value"));
+ plan.setVolume(row.getBigDecimal("numberField_l7fytfd3_value"));
+ plan.setStrength(row.getString("radioField_m9urarr2_id"));
+
+ JSONArray dateArr = row.getJSONArray("cascadeDateField_lfxqqluw");
+ if (dateArr != null && dateArr.size() == 2) {
+ try {
long start = Long.parseLong(dateArr.getString(0));
long end = Long.parseLong(dateArr.getString(1));
- plan.setStartDate(Instant.ofEpochMilli(start)
+ Date startDate = Date.from(Instant.ofEpochMilli(start)
.atZone(ZoneId.systemDefault())
- .toLocalDateTime());
-
- plan.setEndDate(Instant.ofEpochMilli(end)
+ .toLocalDate()
+ .atStartOfDay(ZoneId.systemDefault())
+ .toInstant());
+ Date endDate = Date.from(Instant.ofEpochMilli(end)
.atZone(ZoneId.systemDefault())
- .toLocalDateTime());
- }
+ .toLocalDate()
+ .atStartOfDay(ZoneId.systemDefault())
+ .toInstant());
- // 鎻愪氦浜�
- plan.setSubmitter(originatorName);
- // 缁勭粐
- plan.setSubmitOrg("瀹佸涓垱缁胯兘瀹炰笟闆嗗洟鏈夐檺鍏徃");
- // 澶囨敞
- plan.setRemarkOne(formData.getString("textareaField_l7fytfcy"));
- plan.setRemarkTwo(formData.getString("textField_l7fytfcx"));
- // 鍒涘缓浜�
- plan.setCreatorName(originatorName);
- // 淇敼浜�
- JSONObject modifyUser = item.getJSONObject("modifyUser");
- if (modifyUser != null) {
- plan.setModifierName(modifyUser.getJSONObject("userName").getString("nameInChinese"));
+ plan.setStartDate(startDate);
+ plan.setEndDate(endDate);
+ } catch (Exception e) {
+ log.warn("瑙ｆ瀽鏃ユ湡澶辫触: {}", dateArr);
}
- // 琛ㄥ崟鏃堕棿
- plan.setFormCreatedTime(parseUtcTime(item.getString("createdTimeGMT")));
- plan.setFormModifiedTime(parseUtcTime(item.getString("modifiedTimeGMT")));
- // 鍚屾淇℃伅
- plan.setDataSyncType(dataSyncType);
- plan.setDataSourceType(1);
- // 鏁版嵁搴撴椂闂�
- LocalDateTime now = LocalDateTime.now();
- plan.setCreateTime(now);
- plan.setUpdateTime(now);
+ }
- list.add(plan);
+ plan.setSubmitter(originatorName);
+ plan.setSubmitOrg("瀹佸涓垱缁胯兘瀹炰笟闆嗗洟鏈夐檺鍏徃");
+ plan.setRemarkOne(formData.getString("textareaField_l7fytfcy"));
+ plan.setRemarkTwo(formData.getString("textField_l7fytfcx"));
+ plan.setCreatorName(originatorName);
+
+ JSONObject modifyUser = item.getJSONObject("modifyUser");
+ if (modifyUser != null && modifyUser.containsKey("userName")) {
+ plan.setModifierName(modifyUser.getJSONObject("userName").getString("nameInChinese"));
+ }
+
+ plan.setFormCreatedTime(parseUtcTime(item.getString("createdTimeGMT")));
+ plan.setFormModifiedTime(parseUtcTime(item.getString("modifiedTimeGMT")));
+ plan.setDataSyncType(dataSyncType);
+ plan.setDataSourceType(1);
+ plan.setCreateTime(now);
+ plan.setUpdateTime(now);
+ plan.setTotalCount(totalCount);
+
+ list.add(plan);
+ }
+ }
+ return list;
+ }
+
+ private int processSaveOrUpdate(List<ProductionPlan> list) {
+ if (list == null || list.isEmpty()) {
+ return 0;
+ }
+ int affected = 0;
+
+ // 鍘婚噸 formInstanceId
+ Set<String> formIds = list.stream()
+ .map(ProductionPlan::getFormInstanceId)
+ .collect(Collectors.toSet());
+
+ // 鏌ヨ鏁版嵁搴撳凡鏈夋暟鎹�
+ List<ProductionPlan> existList = this.list(new LambdaQueryWrapper<ProductionPlan>().in(ProductionPlan::getFormInstanceId, formIds));
+
+ // Map (formInstanceId + materialCode)
+ Map<String, ProductionPlan> existMap = new HashMap<>();
+ for (ProductionPlan p : existList) {
+ String key = p.getFormInstanceId() + "_" + p.getMaterialCode();
+ existMap.put(key, p);
+ }
+
+ // 閬嶅巻鍚屾鏁版嵁
+ for (ProductionPlan plan : list) {
+ String key = plan.getFormInstanceId() + "_" + plan.getMaterialCode();
+ ProductionPlan exist = existMap.get(key);
+ if (exist == null) {
+ // 鏂板
+ this.save(plan);
+ affected++;
+ log.info("鏂板鏁版嵁 formInstanceId={}, materialCode={}", plan.getFormInstanceId(), plan.getMaterialCode());
+ } else {
+ // 鍒ゆ柇鏄惁闇�瑕佹洿鏂�
+ if (exist.getFormModifiedTime() == null || !exist.getFormModifiedTime().equals(plan.getFormModifiedTime())) {
+ plan.setId(exist.getId());
+ plan.setCreateTime(exist.getCreateTime());
+ this.updateById(plan);
+ affected++;
+ log.info("鏇存柊鏁版嵁 formInstanceId={}, materialCode={}", plan.getFormInstanceId(), plan.getMaterialCode());
}
}
-
- if (!list.isEmpty()) {
- saveBatch(list);
- }
- log.info("鐢熶骇璁″垝鍚屾瀹屾垚锛屽叡 {} 鏉�", list.size());
- } catch (Exception e) {
- log.error("鍚屾鐢熶骇璁″垝寮傚父", e);
}
+ return affected;
}
private LocalDateTime parseUtcTime(String utcString) {
@@ -228,4 +473,62 @@
return null;
}
}
+
+ @Override
+ public List<ProductionPlanSummaryDto> summaryByProductType(ProductionPlanSummaryDto query) {
+ return baseMapper.selectSummaryByProductType(query);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void importProdData(MultipartFile file) {
+ if (file == null || file.isEmpty()) {
+ throw new ServiceException("瀵煎叆鏁版嵁涓嶈兘涓虹┖");
+ }
+ ExcelUtil<ProductionPlanImportDto> excelUtil = new ExcelUtil<>(ProductionPlanImportDto.class);
+ List<ProductionPlanImportDto> list;
+ try {
+ list = excelUtil.importExcel(file.getInputStream());
+ } catch (Exception e) {
+ log.error("鐢熶骇闇�姹侲xcel瀵煎叆澶辫触", e);
+ throw new ServiceException("Excel瑙ｆ瀽澶辫触");
+ }
+
+ if (list == null || list.isEmpty()) {
+ throw new ServiceException("Excel娌℃湁鏁版嵁");
+ }
+ List<ProductionPlan> entityList = new ArrayList<>(list.size());
+ ProductionPlan entity;
+ for (ProductionPlanImportDto dto : list) {
+ entity = new ProductionPlan();
+ BeanUtils.copyProperties(dto, entity);
+ entity.setAssignedQuantity(BigDecimal.ZERO);
+ entity.setCreateTime(LocalDateTime.now());
+ entity.setUpdateTime(LocalDateTime.now());
+ entity.setDataSourceType(2);
+ entity.setDataSyncType(1);
+
+ entityList.add(entity);
+ }
+ this.saveBatch(entityList);
+ }
+
+ @Override
+ public void exportProdData(HttpServletResponse response, List<Long> ids) {
+ List<ProductionPlan> list;
+ if (ids != null && !ids.isEmpty()) {
+ list = baseMapper.selectBatchIds(ids);
+ } else {
+ list = baseMapper.selectList(null);
+ }
+
+ List<ProductionPlanImportDto> exportList = new ArrayList<>();
+ for (ProductionPlan entity : list) {
+ ProductionPlanImportDto dto = new ProductionPlanImportDto();
+ BeanUtils.copyProperties(entity, dto);
+ exportList.add(dto);
+ }
+ ExcelUtil<ProductionPlanImportDto> util = new ExcelUtil<>(ProductionPlanImportDto.class);
+ util.exportExcel(response, exportList, "閿�鍞敓浜ч渶姹傛暟鎹�");
+ }
}
--
Gitblit v1.9.3