From d347fe9660e8acde29d5c4ab190eef08c7266ffa Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 27 十月 2025 13:56:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpGoodsController.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 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 4a15e18..7c92f59 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
@@ -259,6 +259,9 @@
goods.setCreateId(user.getUserId().toString());
goods.setGoodsIdCode(dto.getGoodsIdCode());
// goods.setClinicPurchasePrice(dto.getSalesAmount());
+ if(goods.getIsPrescriptionDrug()!=null && goods.getIsPrescriptionDrug()==3){
+ goods.setIsPrescriptionDrug(null);
+ }
return R.ok(erpGoodsService.save(goods));
}
@@ -284,6 +287,9 @@
goods.setGoodsIdCode(dto.getGoodsIdCode());
goods.setId(dto.getId());
goods.setGoodsSpec(dto.getFormulationSpec()+"*"+dto.getPackingSpec());
+ if(goods.getIsPrescriptionDrug()!=null && goods.getIsPrescriptionDrug()==3){
+ goods.setIsPrescriptionDrug(null);
+ }
return R.ok(erpGoodsService.updateById(goods));
}
@@ -426,7 +432,9 @@
}
}
-
+ if(goods.getIsPrescriptionDrug()!=null && goods.getIsPrescriptionDrug()==3){
+ goods.setIsPrescriptionDrug(null);
+ }
return R.ok(erpGoodsService.updateById(goods));
}
--
Gitblit v1.7.1