Merge branch '20230223_xt_api_new_branch' of http://git.shengws.com/csx/XT_New into 20230223_xt_api_new_branch

models/new_drug_stock.go

@@ -58,6 +58,7 @@ type NewDrugFlow struct {
 	OrderId                   int64                  `gorm:"column:order_id" json:"order_id" form:"order_id"`
 	FlushOverCount            int64                  `gorm:"column:flush_over_count" json:"flush_over_count" form:"flush_over_count"`
 	Remark                    string                 `gorm:"column:remark" json:"remark" form:"remark"`
+	DrugCode                  string                 `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
 	OperateTime               int64                  `gorm:"column:operate_time" json:"operate_time" form:"operate_time"`
 	SaleDate                  string                 `gorm:"column:sale_date" json:"sale_date" form:"sale_date"`
 	IsSale                    int64                  `gorm:"column:is_sale" json:"is_sale" form:"is_sale"`

models/new_stock.go

@@ -25,6 +25,8 @@ type DrugWarehouseInfoTenOne struct {
 	BatchNumber      string  `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
 	MaxUnit          string  `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
 	MinUnit          string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	DrugCode         string  `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
+
 	//Base                      Drug    `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"drug"`
 	BaseDrugLib               BaseDrugLib `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID"json:"drug" `
 	SupplyWarehouseId         int64       `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`