From 62522fb4eaf6eb80652eb3f66d713f2fa72ba48c Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 10 四月 2026 10:22:02 +0800
Subject: [PATCH] fix: 手动新增区分
---
src/main/java/com/ruoyi/production/service/impl/ProductMaterialServiceImpl.java | 4 ++--
src/main/java/com/ruoyi/production/pojo/ProductMaterialSku.java | 2 +-
src/main/java/com/ruoyi/production/service/impl/ProductMaterialSkuServiceImpl.java | 3 ++-
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductMaterialSku.java b/src/main/java/com/ruoyi/production/pojo/ProductMaterialSku.java
index 1d21049..fd97ede 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductMaterialSku.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductMaterialSku.java
@@ -65,5 +65,5 @@
private LocalDateTime updateTime;
@ApiModelProperty("鏁版嵁鏉ユ簮(1-瀹滄惌/2-閽夐拤)")
- private Long type;
+ private Integer type;
}
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 d28ed6b..b2a7397 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductMaterialServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductMaterialServiceImpl.java
@@ -107,7 +107,7 @@
String searchFieldJson = searchConditions.toJSONString();
LambdaQueryWrapper<ProductMaterialSku> countWrapper = new LambdaQueryWrapper<>();
- countWrapper.eq(ProductMaterialSku::getType, 1L);
+ countWrapper.eq(ProductMaterialSku::getType, 1);
JSONArray dataArr = AliDingUtils.getFormDataList(aliDingConfig, aliDingConfig.getMaterialCodeFormUuid(), searchFieldJson, productMaterialSkuService, ProductMaterialSku::getFormModifiedTime, countWrapper);
@@ -172,7 +172,7 @@
sku.setFormModifiedTime(AliDingUtils.parseUtcTime(item.getString("modifiedTimeGMT")));
sku.setCreateTime(now);
sku.setUpdateTime(now);
- sku.setType(1L);
+ sku.setType(1);
list.add(sku);
}
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductMaterialSkuServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductMaterialSkuServiceImpl.java
index 3ee1d34..f409ff2 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductMaterialSkuServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductMaterialSkuServiceImpl.java
@@ -107,6 +107,7 @@
sku.setCreateTime(now);
}
sku.setUpdateTime(now);
+ sku.setType(2);
if (!this.save(sku)) {
throw new ServiceException("鏂板鐗╂枡瑙勬牸澶辫触");
@@ -139,7 +140,7 @@
if (ids == null || ids.isEmpty()) {
throw new ServiceException("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
}
-
+
if (productionPlanMapper.selectCount(new LambdaQueryWrapper<ProductionPlan>().in(ProductionPlan::getProductMaterialSkuId, ids)) > 0) {
throw new ServiceException("璇ョ墿鏂欏凡琚攢鍞敓浜ц鍒掑紩鐢紝鏃犳硶鍒犻櫎");
}
--
Gitblit v1.9.3