From 08001726c8b946ff4e9ac0a74f933197ad3c4fe2 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期五, 13 三月 2026 10:25:16 +0800
Subject: [PATCH] Merge branch 'dev_宁夏_中盛建材' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_宁夏_中盛建材
---
src/main/java/com/ruoyi/production/service/impl/ProductMaterialServiceImpl.java | 244 ++++++++++++++++++++++++++++++++++++++----------
1 files changed, 190 insertions(+), 54 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductMaterialServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductMaterialServiceImpl.java
index 7367dc7..41aa10f 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductMaterialServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductMaterialServiceImpl.java
@@ -5,15 +5,19 @@
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.http.HttpUtils;
import com.ruoyi.framework.config.AliDingConfig;
+import com.ruoyi.production.dto.ProductMaterialGroupDto;
import com.ruoyi.production.enums.MaterialConfigTypeEnum;
import com.ruoyi.production.mapper.ProductMaterialMapper;
import com.ruoyi.production.pojo.ProductMaterial;
import com.ruoyi.production.pojo.ProductMaterialConfig;
+import com.ruoyi.production.pojo.ProductMaterialSku;
import com.ruoyi.production.service.ProductMaterialConfigService;
import com.ruoyi.production.service.ProductMaterialService;
+import com.ruoyi.production.service.ProductMaterialSkuService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -25,8 +29,7 @@
import java.time.ZoneId;
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;
/**
@@ -48,17 +51,22 @@
@Autowired
private ProductMaterialConfigService productMaterialConfigService;
+ @Autowired
+ private ProductMaterialSkuService productMaterialSkuService;
+
/**
* 鍚屾閿侊紝闃叉鎵嬪姩鍜屽畾鏃朵换鍔″悓鏃舵墽琛�
*/
private final ReentrantLock syncLock = new ReentrantLock();
@Override
+ @Transactional(rollbackFor = Exception.class)
public void loadProductMaterialData() {
syncProductMaterialData(1);
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public void syncProductMaterialJob() {
syncProductMaterialData(2);
}
@@ -94,13 +102,7 @@
JSONObject searchParam = buildSearchParam(lastSyncTime, pageNumber, pageSize);
// 璋冪敤瀹滄惌鎺ュ彛鎷夊彇鏁版嵁
- String dataRes = HttpUtils.sendPostJson(
- aliDingConfig.getSearchFormDataUrl(),
- searchParam.toJSONString(),
- StandardCharsets.UTF_8.name(),
- null,
- accessToken
- );
+ String dataRes = HttpUtils.sendPostJson(aliDingConfig.getSearchFormDataUrl(), searchParam.toJSONString(), StandardCharsets.UTF_8.name(), null, accessToken);
if (StringUtils.isEmpty(dataRes)) {
log.warn("绗� {} 椤垫媺鍙栨暟鎹负绌�", pageNumber);
@@ -117,7 +119,7 @@
}
// 瑙ｆ瀽骞朵繚瀛樻暟鎹�
- List<ProductMaterial> list = parseProductMaterials(dataArr, totalCount);
+ List<ProductMaterialSku> list = parseProductMaterials(dataArr, totalCount);
if (!list.isEmpty()) {
// 澶勭悊鏇存柊鎴栨柊澧�
int affected = processSaveOrUpdate(list);
@@ -141,8 +143,7 @@
}
private String getAccessToken() {
- String params = "appkey=" + aliDingConfig.getAppKey()
- + "&appsecret=" + aliDingConfig.getAppSecret();
+ 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");
@@ -153,9 +154,9 @@
}
private LocalDateTime getLastSyncTime() {
- LambdaQueryWrapper<ProductMaterial> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.orderByDesc(ProductMaterial::getFormModifiedTime).last("LIMIT 1");
- ProductMaterial lastRecord = this.getOne(queryWrapper);
+ LambdaQueryWrapper<ProductMaterialSku> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.orderByDesc(ProductMaterialSku::getFormModifiedTime).last("LIMIT 1");
+ ProductMaterialSku lastRecord = productMaterialSkuService.getOne(queryWrapper);
return lastRecord != null ? lastRecord.getFormModifiedTime() : null;
}
@@ -193,20 +194,18 @@
searchParam.put("orderConfigJson", "{\"gmt_modified\":\"+\"}");
if (lastSyncTime != null) {
- String startTime = lastSyncTime.plusSeconds(1).atZone(ZoneId.systemDefault())
- .format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+ 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"));
+ String endTime = LocalDateTime.now().atZone(ZoneId.systemDefault()).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
searchParam.put("modifiedToTimeGMT", endTime);
return searchParam;
}
- private List<ProductMaterial> parseProductMaterials(JSONArray dataArr, Integer totalCount) {
- List<ProductMaterial> list = new ArrayList<>();
+ private List<ProductMaterialSku> parseProductMaterials(JSONArray dataArr, Integer totalCount) {
+ List<ProductMaterialSku> list = new ArrayList<>();
LocalDateTime now = LocalDateTime.now();
for (int i = 0; i < dataArr.size(); i++) {
@@ -214,47 +213,78 @@
String formInstanceId = item.getString("formInstanceId");
JSONObject originator = item.getJSONObject("originator");
- String originatorName = originator != null && originator.containsKey("userName")
- ? originator.getJSONObject("userName").getString("nameInChinese") : "鏈煡";
-
+ String originatorName = originator != null && originator.containsKey("userName") ? originator.getJSONObject("userName").getString("nameInChinese") : "鏈煡";
JSONObject formData = item.getJSONObject("formData");
+ // 澶勭悊鐗╂枡涓昏〃鏁版嵁
ProductMaterial material = new ProductMaterial();
-
- material.setFormInstanceId(formInstanceId);
- material.setIdentifierCode(formData.getString("textField_l92h77ju"));
- material.setMaterialCode(formData.getString("textField_l92f36f2"));
material.setMaterialName(formData.getString("textField_l92f36f5"));
- material.setSpecification(formData.getString("textField_l92f36f6"));
material.setBaseUnit(formData.getString("textField_la147lnw"));
- material.setMaterialAttribute(formData.getString("selectField_la14k51j"));
- material.setFinishedProductName(formData.getString("radioField_lbkk2nn2"));
material.setRemark(formData.getString("textareaField_l92f36f9"));
- // 澶勭悊鐗╂枡绫诲瀷鍜屽瓨璐х被鍒�
String materialType = formData.getString("selectField_l92f36fb");
String inventoryCat = formData.getString("selectField_la154noy");
material.setMaterialTypeId(getOrCreateConfigId(materialType, MaterialConfigTypeEnum.MATERIAL_TYPE.name()));
material.setInventoryCategoryId(getOrCreateConfigId(inventoryCat, MaterialConfigTypeEnum.INVENTORY_CAT.name()));
- material.setOriginatorName(originatorName);
- material.setOriginatorOrg("瀹佸涓垱缁胯兘瀹炰笟闆嗗洟鏈夐檺鍏徃");
+ Long materialId = getOrCreateMaterial(material);
- material.setFormModifiedTime(parseUtcTime(item.getString("modifiedTimeGMT")));
- material.setCreateTime(now);
- material.setUpdateTime(now);
+ // 澶勭悊鐗╂枡瑙勬牸鏁版嵁
+ ProductMaterialSku sku = new ProductMaterialSku();
+ sku.setMaterialId(materialId);
+ sku.setFormInstanceId(formInstanceId);
+ sku.setIdentifierCode(formData.getString("textField_l92h77ju"));
+ sku.setMaterialCode(formData.getString("textField_l92f36f2"));
+ sku.setSpecification(formData.getString("textField_l92f36f6"));
+ sku.setSupplyType(formData.getString("selectField_la14k51j"));
+ sku.setOriginatorName(originatorName);
+ sku.setOriginatorOrg("瀹佸涓垱缁胯兘瀹炰笟闆嗗洟鏈夐檺鍏徃");
+ sku.setFormModifiedTime(parseUtcTime(item.getString("modifiedTimeGMT")));
+ sku.setCreateTime(now);
+ sku.setUpdateTime(now);
- list.add(material);
+ list.add(sku);
}
return list;
+ }
+
+ private Long getOrCreateMaterial(ProductMaterial material) {
+ LambdaQueryWrapper<ProductMaterial> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(ProductMaterial::getMaterialName, material.getMaterialName());
+
+ ProductMaterial exist = this.getOne(queryWrapper);
+ if (exist == null) {
+ material.setCreateTime(LocalDateTime.now());
+ material.setUpdateTime(LocalDateTime.now());
+ this.save(material);
+ return material.getId();
+ } else {
+ // 濡傛灉宸插瓨鍦紝浣嗗叧閿睘鎬у彂鐢熷彉鍖栵紝鍒欒繘琛屾洿鏂帮紙浠ュ疁鎼暟鎹负鍑嗭級
+ boolean needUpdate = false;
+ if (material.getMaterialTypeId() != null && !material.getMaterialTypeId().equals(exist.getMaterialTypeId())) {
+ exist.setMaterialTypeId(material.getMaterialTypeId());
+ needUpdate = true;
+ }
+ if (material.getInventoryCategoryId() != null && !material.getInventoryCategoryId().equals(exist.getInventoryCategoryId())) {
+ exist.setInventoryCategoryId(material.getInventoryCategoryId());
+ needUpdate = true;
+ }
+ if (StringUtils.isNotEmpty(material.getBaseUnit()) && !material.getBaseUnit().equals(exist.getBaseUnit())) {
+ exist.setBaseUnit(material.getBaseUnit());
+ needUpdate = true;
+ }
+ if (needUpdate) {
+ exist.setUpdateTime(LocalDateTime.now());
+ this.updateById(exist);
+ }
+ return exist.getId();
+ }
}
private Integer getOrCreateConfigId(String name, String type) {
if (StringUtils.isEmpty(name)) {
return null;
}
- ProductMaterialConfig config = productMaterialConfigService.getOne(new LambdaQueryWrapper<ProductMaterialConfig>()
- .eq(ProductMaterialConfig::getConfigName, name)
- .eq(ProductMaterialConfig::getConfigType, type));
+ ProductMaterialConfig config = productMaterialConfigService.getOne(new LambdaQueryWrapper<ProductMaterialConfig>().eq(ProductMaterialConfig::getConfigName, name).eq(ProductMaterialConfig::getConfigType, type));
if (config == null) {
config = new ProductMaterialConfig();
config.setConfigName(name);
@@ -264,27 +294,37 @@
return config.getId();
}
- private int processSaveOrUpdate(List<ProductMaterial> list) {
+ private int processSaveOrUpdate(List<ProductMaterialSku> list) {
if (list == null || list.isEmpty()) {
return 0;
}
int affected = 0;
- for (ProductMaterial material : list) {
- ProductMaterial exist = this.getOne(new LambdaQueryWrapper<ProductMaterial>()
- .eq(ProductMaterial::getFormInstanceId, material.getFormInstanceId()));
+ for (ProductMaterialSku sku : list) {
- if (exist == null) {
- this.save(material);
- affected++;
- log.info("鏂板鐗╂枡鏁版嵁 formInstanceId={}", material.getFormInstanceId());
+ LambdaQueryWrapper<ProductMaterialSku> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(ProductMaterialSku::getMaterialId, sku.getMaterialId())
+ .eq(ProductMaterialSku::getSpecification, sku.getSpecification());
+
+ if (StringUtils.isNotEmpty(sku.getMaterialCode())) {
+ wrapper.eq(ProductMaterialSku::getMaterialCode, sku.getMaterialCode());
} else {
- if (exist.getFormModifiedTime() == null || !exist.getFormModifiedTime().equals(material.getFormModifiedTime())) {
- material.setId(exist.getId());
- material.setCreateTime(exist.getCreateTime());
- this.updateById(material);
+ wrapper.isNull(ProductMaterialSku::getMaterialCode);
+ }
+
+ ProductMaterialSku exist = productMaterialSkuService.getOne(wrapper);
+ if (exist == null) {
+ productMaterialSkuService.save(sku);
+ affected++;
+ log.info("鏂板鐗╂枡瑙勬牸 {}", sku.getSpecification());
+ } else {
+ if (exist.getFormModifiedTime() == null || !exist.getFormModifiedTime().equals(sku.getFormModifiedTime())) {
+ sku.setId(exist.getId());
+ sku.setCreateTime(exist.getCreateTime());
+ productMaterialSkuService.updateById(sku);
+
affected++;
- log.info("鏇存柊鐗╂枡鏁版嵁 formInstanceId={}", material.getFormInstanceId());
+ log.info("鏇存柊鐗╂枡瑙勬牸 {}", sku.getSpecification());
}
}
}
@@ -303,4 +343,100 @@
return null;
}
}
+
+ @Override
+ public List<ProductMaterialGroupDto> ProductMaterialList(String materialName) {
+
+ List<ProductMaterialConfig> materialConfigList = productMaterialConfigService.list(new LambdaQueryWrapper<ProductMaterialConfig>()
+ .eq(ProductMaterialConfig::getConfigType, MaterialConfigTypeEnum.MATERIAL_TYPE.name()));
+
+ List<ProductMaterialGroupDto> productMaterialMap = new ArrayList<>();
+ if (materialConfigList == null || materialConfigList.isEmpty()) {
+ return productMaterialMap;
+ }
+ for (ProductMaterialConfig materialConfig : materialConfigList) {
+ LambdaQueryWrapper<ProductMaterial> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(ProductMaterial::getMaterialTypeId, materialConfig.getId())
+ .like(materialName != null && !materialName.isEmpty(), ProductMaterial::getMaterialName, materialName);
+ List<ProductMaterial> productMaterialList = list(wrapper);
+ ProductMaterialGroupDto dto = new ProductMaterialGroupDto();
+ dto.setConfigId(materialConfig.getId());
+ dto.setConfigName(materialConfig.getConfigName());
+ dto.setMaterialList(productMaterialList);
+ productMaterialMap.add(dto);
+ }
+ return productMaterialMap;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void addProductMaterial(ProductMaterial productMaterial) {
+ validateProductMaterial(productMaterial, false);
+ if (existsMaterialName(productMaterial.getMaterialName(), null)) {
+ throw new ServiceException("鐗╂枡鍚嶇О宸插瓨鍦�");
+ }
+ LocalDateTime now = LocalDateTime.now();
+ if (productMaterial.getCreateTime() == null) {
+ productMaterial.setCreateTime(now);
+ }
+ productMaterial.setUpdateTime(now);
+ if (!this.save(productMaterial)) {
+ throw new ServiceException("鏂板鐗╂枡澶辫触");
+ }
+ log.info("鏂板鐗╂枡鎴愬姛 materialName={}", productMaterial.getMaterialName());
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void updateProductMaterial(ProductMaterial productMaterial) {
+ validateProductMaterial(productMaterial, true);
+ ProductMaterial exist = this.getById(productMaterial.getId());
+ if (exist == null) {
+ throw new ServiceException("鐗╂枡涓嶅瓨鍦�");
+ }
+ if (existsMaterialName(productMaterial.getMaterialName(), productMaterial.getId())) {
+ throw new ServiceException("鐗╂枡鍚嶇О宸插瓨鍦�");
+ }
+ productMaterial.setUpdateTime(LocalDateTime.now());
+ if (!this.updateById(productMaterial)) {
+ throw new ServiceException("淇敼鐗╂枡澶辫触");
+ }
+ log.info("淇敼鐗╂枡鎴愬姛 id={}", productMaterial.getId());
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void deleteProductMaterial(List<Long> ids) {
+ if (ids == null || ids.isEmpty()) {
+ throw new ServiceException("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ }
+ if (!this.removeByIds(ids)) {
+ throw new ServiceException("鍒犻櫎鐗╂枡澶辫触");
+ }
+ log.info("鍒犻櫎鐗╂枡鎴愬姛 ids={}", ids);
+ }
+
+ private void validateProductMaterial(ProductMaterial productMaterial, boolean requireId) {
+ if (productMaterial == null) {
+ throw new ServiceException("鍙傛暟涓嶈兘涓虹┖");
+ }
+ if (requireId && productMaterial.getId() == null) {
+ throw new ServiceException("涓婚敭ID涓嶈兘涓虹┖");
+ }
+ if (StringUtils.isEmpty(productMaterial.getMaterialName())) {
+ throw new ServiceException("鐗╂枡鍚嶇О涓嶈兘涓虹┖");
+ }
+ }
+
+ private boolean existsMaterialName(String materialName, Long excludeId) {
+ if (StringUtils.isEmpty(materialName)) {
+ return false;
+ }
+ LambdaQueryWrapper<ProductMaterial> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(ProductMaterial::getMaterialName, materialName);
+ if (excludeId != null) {
+ queryWrapper.ne(ProductMaterial::getId, excludeId);
+ }
+ return this.count(queryWrapper) > 0;
+ }
}
--
Gitblit v1.9.3