From f78568f86ea3958188f39c1dac6aa8c9c557f4e4 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 24 十月 2025 18:30:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpGoodsController.java | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpGoodsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpGoodsController.java
index 8cf9977..4a15e18 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpGoodsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpGoodsController.java
@@ -247,6 +247,7 @@
Integer roleType = user.getRoleType();
TErpGoods goods = new TErpGoods();
BeanUtils.copyProperties(dto,goods);
+ goods.setGoodsSpec(dto.getFormulationSpec()+"*"+dto.getPackingSpec());
if(roleType == 5){
// 诊所
TCrmClinic crmClinic = crmClinicService.getOne(Wrappers.lambdaQuery(TCrmClinic.class)
@@ -282,6 +283,7 @@
goods.setCreateId(user.getUserId().toString());
goods.setGoodsIdCode(dto.getGoodsIdCode());
goods.setId(dto.getId());
+ goods.setGoodsSpec(dto.getFormulationSpec()+"*"+dto.getPackingSpec());
return R.ok(erpGoodsService.updateById(goods));
}
--
Gitblit v1.7.1