2

api/service/product.go

@@ -28,7 +28,8 @@ func (r *ProductService) GetProductPlatform(productPlatformId int64) (g *dto.Pro
 	var quantity int
 
 	ReportPreRequest := prescription.GetProdStockRequest{
-		DrugCode: productPlatform.ProductPharmacyCode,
+		PharmacyCode: productPlatform.PharmacyCode,
+		DrugCode:     productPlatform.ProductPharmacyCode,
 	}
 
 	result, err := ReportPreRequest.GetProdStock()
@@ -188,7 +189,8 @@ func (r *ProductService) AddProduct(userId string, req requests.AddProduct) (boo
 
 	// 获取商品库存
 	ReportPreRequest := prescription.GetProdStockRequest{
-		DrugCode: product.ProductPharmacyCode,
+		PharmacyCode: product.PharmacyCode,
+		DrugCode:     product.ProductPharmacyCode,
 	}
 
 	result, err := ReportPreRequest.GetProdStock()

extend/prescription/prescription.go

@@ -409,7 +409,9 @@ func (r ReportPreRequest) ReportPre() (bool, error) {
 
 // GetProdStock 获取商品库存
 func (r GetProdStockRequest) GetProdStock() (*GetProdStockDataResponse, error) {
-	r.PharmacyCode = config.C.Pre.PrePlatPharmacyCode
+	if r.PharmacyCode == "" {
+		r.PharmacyCode = config.C.Pre.PrePlatPharmacyCode
+	}
 	jsonData, err := json.Marshal(r)
 	if err != nil {
 		utils.LogJsonErr("获取商品库存-序列化请求参数失败", err)
@@ -483,5 +485,8 @@ func (r GetProdStockRequest) GetProdStock() (*GetProdStockDataResponse, error) {
 	}
 
 	utils.LogJsonInfo("获取商品库存-成功", response.Data)
+	if len(response.Data) == 0 {
+		return &GetProdStockDataResponse{Quantity: "0"}, nil
+	}
 	return &response.Data[0], nil
 }