耗材参数

models/drug_stock.go

@@ -1,7 +1,5 @@
 package models
 
-import "gdyb/models"
-
 type DrugWarehouse struct {
 	ID               int64  `gorm:"column:id" json:"id" form:"id"`
 	WarehousingOrder string `gorm:"column:warehousing_order" json:"warehousing_order" form:"warehousing_order"`
@@ -193,22 +191,22 @@ func (DrugSalesReturnInfo) TableName() string {
 }
 
 type DrugCancelStock struct {
-	ID                  int64                         `gorm:"column:id" json:"id" form:"id"`
-	OrderNumber         string                        `gorm:"column:order_number" json:"order_number" form:"order_number"`
-	OperaTime           int64                         `gorm:"column:opera_time" json:"opera_time" form:"opera_time"`
-	Total               int64                         `gorm:"column:total" json:"total" form:"total"`
-	Creater             int64                         `gorm:"column:creater" json:"creater" form:"creater"`
-	Ctime               int64                         `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime               int64                         `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	Status              int64                         `gorm:"column:status" json:"status" form:"status"`
-	OrgId               int64                         `gorm:"column:org_id" json:"org_id" form:"org_id"`
-	ReturnTime          int64                         `gorm:"column:return_time" json:"return_time" form:"return_time"`
-	Dealer              int64                         `gorm:"column:dealer" json:"dealer" form:"dealer"`
-	Manufacturer        int64                         `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
-	Type                int64                         `gorm:"column:type" json:"type" form:"type"`
-	Manufacturers       *Manufacturer                 `gorm:"ForeignKey:Manufacturer;AssociationForeignKey:ID" json:"manufacturers"`
-	Dealers             *Dealer                       `gorm:"ForeignKey:Dealer;AssociationForeignKey:ID" json:"dealers"`
-	DrugCancelStockInfo []*models.DrugCancelStockInfo `gorm:"ForeignKey:CancelStockId;AssociationForeignKey:ID" json:"drugCancelStockInfo"`
+	ID                  int64                  `gorm:"column:id" json:"id" form:"id"`
+	OrderNumber         string                 `gorm:"column:order_number" json:"order_number" form:"order_number"`
+	OperaTime           int64                  `gorm:"column:opera_time" json:"opera_time" form:"opera_time"`
+	Total               int64                  `gorm:"column:total" json:"total" form:"total"`
+	Creater             int64                  `gorm:"column:creater" json:"creater" form:"creater"`
+	Ctime               int64                  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime               int64                  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status              int64                  `gorm:"column:status" json:"status" form:"status"`
+	OrgId               int64                  `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	ReturnTime          int64                  `gorm:"column:return_time" json:"return_time" form:"return_time"`
+	Dealer              int64                  `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Manufacturer        int64                  `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	Type                int64                  `gorm:"column:type" json:"type" form:"type"`
+	Manufacturers       *Manufacturer          `gorm:"ForeignKey:Manufacturer;AssociationForeignKey:ID" json:"manufacturers"`
+	Dealers             *Dealer                `gorm:"ForeignKey:Dealer;AssociationForeignKey:ID" json:"dealers"`
+	DrugCancelStockInfo []*DrugCancelStockInfo `gorm:"ForeignKey:CancelStockId;AssociationForeignKey:ID" json:"drugCancelStockInfo"`
 }
 
 func (DrugCancelStock) TableName() string {

models/gobal_models.go

@@ -89,3 +89,34 @@ type SystemPrescription struct {
 func (SystemPrescription) TableName() string {
 	return "xt_system_prescription"
 }
+
+type StDrugCancelStockInfo struct {
+	ID               int64       `gorm:"column:id" json:"id" form:"id"`
+	DrugId           int64       `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	CancelStockId    int64       `gorm:"column:cancel_stock_id" json:"cancel_stock_id" form:"cancel_stock_id"`
+	Count            int64       `gorm:"column:count" json:"count" form:"count"`
+	Price            float64     `gorm:"column:price" json:"price" form:"price"`
+	Total            float64     `gorm:"column:total" json:"total" form:"total"`
+	ProductDate      int64       `gorm:"column:product_date" json:"product_date" form:"product_date"`
+	ExpiryDate       int64       `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
+	Ctime            int64       `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime            int64       `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status           int64       `gorm:"column:status" json:"status" form:"status"`
+	OrgId            int64       `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	OrderNumber      string      `gorm:"column:order_number" json:"order_number" form:"order_number"`
+	Type             int64       `gorm:"column:type" json:"type" form:"type"`
+	Dealer           string      `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Manufacturer     string      `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	RetailPrice      float64     `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	RetailTotalPrice float64     `gorm:"column:retail_total_price" json:"retail_total_price" form:"retail_total_price"`
+	Number           string      `gorm:"column:number" json:"number" form:"number"`
+	RegisterAccount  string      `gorm:"column:register_account" json:"register_account" form:"register_account"`
+	Remark           string      `gorm:"column:remark" json:"remark" form:"remark"`
+	BatchNumber      string      `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	MaxUnit          string      `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
+	BaseDrugLib      BaseDrugLib `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" `
+}
+
+func (StDrugCancelStockInfo) TableName() string {
+	return "xt_drug_cancel_stock_info"
+}

models/good_models.go

@@ -105,3 +105,28 @@ type GoodsTypeOne struct {
 func (GoodsTypeOne) TableName() string {
 	return "xt_goods_type"
 }
+
+type XtCancelStockInfo struct {
+	ID            int64       `gorm:"column:id" json:"id"`
+	GoodId        int64       `gorm:"column:good_id" json:"good_id"`
+	CancelStockId int64       `gorm:"column:cancel_stock_id" json:"cancel_stock_id"`
+	GoodTypeId    int64       `gorm:"column:good_type_id" json:"good_type_id"`
+	Count         int64       `gorm:"column:count" json:"count"`
+	Price         float64     `gorm:"column:price" json:"price"`
+	Total         float64     `gorm:"column:total" json:"total"`
+	ProductDate   int64       `gorm:"column:product_date" json:"product_date"`
+	ExpiryDate    int64       `gorm:"column:expiry_date" json:"expiry_date"`
+	Ctime         int64       `gorm:"column:ctime" json:"ctime"`
+	Mtime         int64       `gorm:"column:mtime" json:"mtime"`
+	Status        int64       `gorm:"column:status" json:"status"`
+	OrgId         int64       `gorm:"column:org_id" json:"org_id"`
+	OrderNumber   string      `gorm:"column:order_number" json:"order_number"`
+	Type          int64       `gorm:"column:type" json:"type"`
+	CancelStock   CancelStock `ForeignKey:CancelStockId json:"CancelStock"`
+	Dealer        int64       `gorm:"column:dealer" json:"dealer"`
+	Manufacturer  int64       `gorm:"column:manufacturer" json:"manufacturer"`
+}
+
+func (XtCancelStockInfo) TableName() string {
+	return "xt_cancel_stock_info"
+}

models/stock_models.go

@@ -1,7 +1,5 @@
 package models
 
-import "XT/models"
-
 type Manufacturer struct {
 	ID               int64  `gorm:"column:id" json:"id"`
 	ManufacturerName string `gorm:"column:manufacturer_name" json:"manufacturer_name"`
@@ -283,35 +281,6 @@ type VmCancelStockInfo struct {
 	OrgId  int64 `gorm:"column:org_id" json:"org_id"`
 }
 
-type CancelStockInfo struct {
-	ID              int64       `gorm:"column:id" json:"id"`
-	GoodId          int64       `gorm:"column:good_id" json:"good_id"`
-	CancelStockId   int64       `gorm:"column:cancel_stock_id" json:"cancel_stock_id"`
-	GoodTypeId      int64       `gorm:"column:good_type_id" json:"good_type_id"`
-	Count           int64       `gorm:"column:count" json:"count"`
-	Price           float64     `gorm:"column:price" json:"price"`
-	Total           float64     `gorm:"column:total" json:"total"`
-	ProductDate     int64       `gorm:"column:product_date" json:"product_date"`
-	ExpiryDate      int64       `gorm:"column:expiry_date" json:"expiry_date"`
-	Ctime           int64       `gorm:"column:ctime" json:"ctime"`
-	Mtime           int64       `gorm:"column:mtime" json:"mtime"`
-	Status          int64       `gorm:"column:status" json:"status"`
-	OrgId           int64       `gorm:"column:org_id" json:"org_id"`
-	OrderNumber     string      `gorm:"column:order_number" json:"order_number"`
-	Type            int64       `gorm:"column:type" json:"type"`
-	CancelStock     CancelStock `ForeignKey:CancelStockId json:"CancelStock"`
-	Dealer          string      `gorm:"column:dealer" json:"dealer"`
-	Manufacturer    string      `gorm:"column:manufacturer" json:"manufacturer"`
-	GoodInfo        GoodInfo    `gorm:"ForeignKey:ID;AssociationForeignKey:GoodId" `
-	Number          string      `gorm:"column:number" json:"number" form:"number"`
-	RegisterAccount string      `gorm:"column:register_account" json:"register_account" form:"register_account"`
-	Remark          string      `gorm:"column:remark" json:"remark" form:"remark"`
-}
-
-func (CancelStockInfo) TableName() string {
-	return "xt_cancel_stock_info"
-}
-
 type CancelStock struct {
 	ID              int64  `gorm:"column:id" json:"id"`
 	OrderNumber     string `gorm:"column:order_number" json:"order_number"`
@@ -326,7 +295,7 @@ type CancelStock struct {
 	Dealer          int64  `gorm:"column:dealer" json:"dealer"`
 	Manufacturer    int64  `gorm:"column:manufacturer" json:"manufacturer"`
 	Type            int64  `gorm:"column:type" json:"type"`
-	CancelStockInfo []*models.CancelStockInfo
+	CancelStockInfo []*XtCancelStockInfo
 }
 
 func (CancelStock) TableName() string {
@@ -556,3 +525,32 @@ type VmStockFlow struct {
 func (VmStockFlow) TableName() string {
 	return "xt_stock_flow"
 }
+
+type CancelStockInfo struct {
+	ID              int64       `gorm:"column:id" json:"id"`
+	GoodId          int64       `gorm:"column:good_id" json:"good_id"`
+	CancelStockId   int64       `gorm:"column:cancel_stock_id" json:"cancel_stock_id"`
+	GoodTypeId      int64       `gorm:"column:good_type_id" json:"good_type_id"`
+	Count           int64       `gorm:"column:count" json:"count"`
+	Price           float64     `gorm:"column:price" json:"price"`
+	Total           float64     `gorm:"column:total" json:"total"`
+	ProductDate     int64       `gorm:"column:product_date" json:"product_date"`
+	ExpiryDate      int64       `gorm:"column:expiry_date" json:"expiry_date"`
+	Ctime           int64       `gorm:"column:ctime" json:"ctime"`
+	Mtime           int64       `gorm:"column:mtime" json:"mtime"`
+	Status          int64       `gorm:"column:status" json:"status"`
+	OrgId           int64       `gorm:"column:org_id" json:"org_id"`
+	OrderNumber     string      `gorm:"column:order_number" json:"order_number"`
+	Type            int64       `gorm:"column:type" json:"type"`
+	CancelStock     CancelStock `ForeignKey:CancelStockId json:"CancelStock"`
+	Dealer          string      `gorm:"column:dealer" json:"dealer"`
+	Manufacturer    string      `gorm:"column:manufacturer" json:"manufacturer"`
+	Number          string      `gorm:"column:number" json:"number" form:"number"`
+	RegisterAccount string      `gorm:"column:register_account" json:"register_account" form:"register_account"`
+	Remark          string      `gorm:"column:remark" json:"remark" form:"remark"`
+	GoodInfo        GoodInfo    `gorm:"ForeignKey:ID;AssociationForeignKey:GoodId" `
+}
+
+func (CancelStockInfo) TableName() string {
+	return "xt_cancel_stock_info"
+}