From 58a83775313b3faab9c5028646f94276f26f9189 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Mon, 29 Jul 2024 18:51:51 +0800
Subject: [PATCH] =?UTF-8?q?7/29=201.1=20=E6=9B=B4=E6=94=B9=E8=8D=AF?=
=?UTF-8?q?=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../basic/UdiContrastController.java | 3 +-
.../api/entity/basic/UdiProductEntity.java | 1 +
.../glxp/api/req/basic/AddProductRequest.java | 2 +
.../mybatis/mapper/basic/UdiProductDao.xml | 45 +++++++++++++++++++
src/main/resources/schemas/schema_v2.4.sql | 3 +-
5 files changed, 52 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java b/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java
index eb52be774..418c228c1 100644
--- a/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java
+++ b/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java
@@ -327,8 +327,9 @@ public class UdiContrastController {
@PostMapping("/udi/udirel/updatetDrug")
public BaseResponse updatetDrug(@RequestBody AddProductRequest addProductRequest) {
UdiProductEntity udiProductEntity = new UdiProductEntity();
+ udiProductEntity.setPrice(addProductRequest.getPrice().toString());
BeanUtils.copyProperties(addProductRequest, udiProductEntity);
- udiProductService.updateUdiInfo(udiProductEntity);
+ boolean b = udiProductService.updateUdiInfo(udiProductEntity);
return ResultVOUtils.success();
}
diff --git a/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java b/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java
index 9842e301d..dff2182aa 100644
--- a/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java
+++ b/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java
@@ -5,6 +5,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.math.BigDecimal;
import java.util.Date;
/**
diff --git a/src/main/java/com/glxp/api/req/basic/AddProductRequest.java b/src/main/java/com/glxp/api/req/basic/AddProductRequest.java
index 658438804..dbba17e8e 100644
--- a/src/main/java/com/glxp/api/req/basic/AddProductRequest.java
+++ b/src/main/java/com/glxp/api/req/basic/AddProductRequest.java
@@ -254,4 +254,6 @@ public class AddProductRequest {
*/
private String bzgg;
private String packRatio;
+ private String uuid;
+ private String nameCode;
}
diff --git a/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml b/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml
index 5ca944a82..c0777628c 100644
--- a/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml
+++ b/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml
@@ -541,6 +541,51 @@
categoryName=#{categoryName},
+
+ requireScanCode=#{requireScanCode},
+
+
+ bzgg=#{bzgg},
+
+
+ levelUnit=#{levelUnit},
+
+
+ prepnUnit=#{prepnUnit},
+
+
+ prepnSpec=#{prepnSpec},
+
+
+ specialCode=#{specialCode},
+
+
+ storageCondition=#{storageCondition},
+
+
+ transportCondition=#{transportCondition},
+
+
+ indate=#{indate},
+
+
+ useAttribute=#{useAttribute},
+
+
+ majorType=#{majorType},
+
+
+ majorStatus=#{majorStatus},
+
+
+ physicType=#{physicType},
+
+
+ medicareType=#{medicareType},
+
+
+ packMatrial=#{packMatrial},
+
WHERE nameCode = #{nameCode}
and uuid = #{uuid}
diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql
index 497cc7b62..c6c1ba4fb 100644
--- a/src/main/resources/schemas/schema_v2.4.sql
+++ b/src/main/resources/schemas/schema_v2.4.sql
@@ -3877,7 +3877,7 @@ CREATE TABLE IF NOT EXISTS `sys_workplace`
CALL Pro_Temp_ColumnWork('basic_products', 'productsType',
- ' tinyint NULL DEFAULT NULL COMMENT ''产品类型 1:药品 2:耗材''',
+ ' tinyint NULL DEFAULT NULL COMMENT ''产品类型 1:耗材 2:药品''',
1);
@@ -4069,3 +4069,4 @@ CALL Pro_Temp_ColumnWork('io_order', 'productType',
' tinyint NULL DEFAULT NULL COMMENT ''产品类型(1.耗材，2.药品)''',
1);
+