From 46b2ee5f0d9fc6ffaffee1f9de3f4f56d63355b4 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 13 三月 2026 13:31:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材
---
src/main/java/com/ruoyi/productionPlan/pojo/ProductionPlan.java | 9 +---
/dev/null | 39 -------------------
src/main/java/com/ruoyi/productionPlan/service/impl/ProductionPlanServiceImpl.java | 14 +++----
doc/宁夏-中盛建材.sql | 5 ++
src/main/java/com/ruoyi/productionPlan/enums/DataSourceTypeEnum.java | 4 +-
5 files changed, 15 insertions(+), 56 deletions(-)
diff --git "a/doc/\345\256\201\345\244\217-\344\270\255\347\233\233\345\273\272\346\235\220.sql" "b/doc/\345\256\201\345\244\217-\344\270\255\347\233\233\345\273\272\346\235\220.sql"
index f9803fe..33e8ed8 100644
--- "a/doc/\345\256\201\345\244\217-\344\270\255\347\233\233\345\273\272\346\235\220.sql"
+++ "b/doc/\345\256\201\345\244\217-\344\270\255\347\233\233\345\273\272\346\235\220.sql"
@@ -171,3 +171,8 @@
alter table production_plan
add status tinyint default 0 not null comment '鐘舵�� 0鏈笅鍙� 1宸蹭笅鍙�';
+
+
+ALTER TABLE `product-inventory-management-zsjc`.`production_plan`
+ DROP COLUMN `data_sync_type`,
+ MODIFY COLUMN `data_source_type` tinyint NULL DEFAULT 1 COMMENT '鏁版嵁鏉ユ簮绫诲瀷锛�1=閽夐拤鍚屾 2=鎵嬪姩鏂板' AFTER `form_modified_time`;
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/productionPlan/enums/DataSourceTypeEnum.java b/src/main/java/com/ruoyi/productionPlan/enums/DataSourceTypeEnum.java
index 10edbd4..bd7ed7a 100644
--- a/src/main/java/com/ruoyi/productionPlan/enums/DataSourceTypeEnum.java
+++ b/src/main/java/com/ruoyi/productionPlan/enums/DataSourceTypeEnum.java
@@ -14,8 +14,8 @@
@Getter
public enum DataSourceTypeEnum {
- SALES_ORDER(1, "鍚屾"),
- PRODUCTION_FORECAST(2, "鏂板");
+ DING_TALK(1, "閽夐拤鍚屾"),
+ MANUAL(2, "鎵嬪姩鏂板");
private final Integer code;
private final String desc;
diff --git a/src/main/java/com/ruoyi/productionPlan/enums/DataSyncTypeEnum.java b/src/main/java/com/ruoyi/productionPlan/enums/DataSyncTypeEnum.java
deleted file mode 100644
index 02de6c5..0000000
--- a/src/main/java/com/ruoyi/productionPlan/enums/DataSyncTypeEnum.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.ruoyi.productionPlan.enums;
-
-import lombok.Getter;
-
-/**
- * <br>
- * 鏁版嵁鏂瑰紡鏋氫妇绫�
- * </br>
- *
- * @author deslrey
- * @version 1.0
- * @since 2026/03/10 10:36
- */
-@Getter
-public enum DataSyncTypeEnum {
-
- MANUAL(1, "鎵嬪姩"),
- SCHEDULED(2, "瀹氭椂");
-
- private final Integer code;
- private final String desc;
-
- DataSyncTypeEnum(Integer code, String desc) {
- this.code = code;
- this.desc = desc;
- }
-
- public static DataSyncTypeEnum getByCode(Integer code) {
- if (code == null) {
- return null;
- }
- for (DataSyncTypeEnum type : DataSyncTypeEnum.values()) {
- if (type.getCode().equals(code)) {
- return type;
- }
- }
- return null;
- }
-}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/productionPlan/pojo/ProductionPlan.java b/src/main/java/com/ruoyi/productionPlan/pojo/ProductionPlan.java
index e47eac5..72866c7 100644
--- a/src/main/java/com/ruoyi/productionPlan/pojo/ProductionPlan.java
+++ b/src/main/java/com/ruoyi/productionPlan/pojo/ProductionPlan.java
@@ -184,16 +184,11 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime formModifiedTime;
- /**
- * 鏁版嵁鍚屾绫诲瀷锛�1=鎵嬪姩 2=瀹氭椂浠诲姟
- */
- @ApiModelProperty("鏁版嵁鍚屾绫诲瀷锛�1=鎵嬪姩 2=瀹氭椂浠诲姟")
- private Integer dataSyncType;
/**
- * 鏁版嵁鏉ユ簮绫诲瀷锛�1=鍚屾 2=鏂板
+ * 鏁版嵁鏉ユ簮绫诲瀷锛�1=閽夐拤鍚屾 2=鎵嬪姩鏂板
*/
- @ApiModelProperty("鏁版嵁鏉ユ簮绫诲瀷锛�1=鍚屾 2=鏂板")
+ @ApiModelProperty("鏁版嵁鏉ユ簮绫诲瀷锛�1=閽夐拤鍚屾 2=鎵嬪姩鏂板")
private Integer dataSourceType;
/**
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 e9dd43f..0d9b176 100644
--- a/src/main/java/com/ruoyi/productionPlan/service/impl/ProductionPlanServiceImpl.java
+++ b/src/main/java/com/ruoyi/productionPlan/service/impl/ProductionPlanServiceImpl.java
@@ -24,6 +24,7 @@
import com.ruoyi.productionPlan.dto.ProductionPlanDto;
import com.ruoyi.productionPlan.dto.ProductionPlanImportDto;
import com.ruoyi.productionPlan.dto.ProductionPlanSummaryDto;
+import com.ruoyi.productionPlan.enums.DataSourceTypeEnum;
import com.ruoyi.productionPlan.mapper.ProductOrderPlanMapper;
import com.ruoyi.productionPlan.mapper.ProductionPlanMapper;
import com.ruoyi.productionPlan.pojo.ProductOrderPlan;
@@ -45,7 +46,6 @@
import java.util.concurrent.locks.ReentrantLock;
import java.util.stream.Collectors;
-import static com.ruoyi.productionPlan.enums.DataSourceTypeEnum.PRODUCTION_FORECAST;
/**
* <br>
@@ -133,7 +133,7 @@
// 鍙犲姞鍓╀綑鏂规暟
BigDecimal totalRemainingVolume = plans.stream()
.map(ProductionPlan::getRemainingVolume)
- .filter(v -> v != null)
+ .filter(Objects::nonNull)
.reduce(BigDecimal.ZERO, BigDecimal::add);
// 鍒ゆ柇涓嬪彂鏁伴噺鏄惁澶т簬绛変簬鍓╀綑鏂规暟
if (productionPlanDto.getTotalAssignedQuantity().compareTo(totalRemainingVolume) > 0) {
@@ -196,7 +196,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
public boolean add(ProductionPlanDto productionPlanDto) {
- productionPlanDto.setDataSourceType(PRODUCTION_FORECAST.getCode());
+ productionPlanDto.setDataSourceType(DataSourceTypeEnum.MANUAL.getCode());
productionPlanDto.setStatus(0);
productionPlanMapper.insert(productionPlanDto);
return true;
@@ -243,7 +243,7 @@
@Transactional(rollbackFor = Exception.class)
public void syncProdData(Integer dataSyncType) {
if (!syncLock.tryLock()) {
- log.warn("鍚屾姝ｅ湪杩涜涓紝鏈 {} 鍚屾璇锋眰琚烦杩�", dataSyncType == 1 ? "鎵嬪姩" : "瀹氭椂浠诲姟");
+ log.warn("鍚屾姝ｅ湪杩涜涓紝鏈 {} 鍚屾璇锋眰琚烦杩�", dataSyncType == 1 ? "鎵嬪姩鍚屾" : "瀹氭椂浠诲姟鍚屾");
return;
}
@@ -460,8 +460,7 @@
plan.setFormCreatedTime(parseUtcTime(item.getString("createdTimeGMT")));
plan.setFormModifiedTime(parseUtcTime(item.getString("modifiedTimeGMT")));
- plan.setDataSyncType(dataSyncType);
- plan.setDataSourceType(1);
+ plan.setDataSourceType(DataSourceTypeEnum.DING_TALK.getCode());
plan.setCreateTime(now);
plan.setUpdateTime(now);
plan.setTotalCount(totalCount);
@@ -560,8 +559,7 @@
entity.setAssignedQuantity(BigDecimal.ZERO);
entity.setCreateTime(LocalDateTime.now());
entity.setUpdateTime(LocalDateTime.now());
- entity.setDataSourceType(2);
- entity.setDataSyncType(1);
+ entity.setDataSourceType(DataSourceTypeEnum.DING_TALK.getCode());
// 鏍规嵁鐗╂枡缂栫爜濉厖鍏宠仈ID
if (StringUtils.isNotEmpty(dto.getMaterialCode())) {
--
Gitblit v1.9.3