提交代码

controllers/pharmacy_controller.go

@@ -1416,17 +1416,14 @@ func (this *PharmacyController) ChangeDrugCode() {
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 	data_source, _ := this.GetInt64("data_source")
 	drug_code := this.GetString("drug_code")
-	item_type := this.GetString("type")
+	//item_type := this.GetString("type")
 
 	str := strings.Replace(drug_code, " ", "", -1)
 	// 去除换行符
 	str = strings.Replace(str, "\n", "", -1)
 	if data_source == 1 {
-		if item_type == "1" {
-			service.ChangeHisDrugCode(id, str, orgId)
-		} else {
-			service.ChangeHisProjectCode(id, str, orgId)
-		}
+		service.ChangeHisDrugCode(id, str, orgId)
+
 	}
 	if data_source == 2 {
 		service.ChangeAdivceDrugCode(id, str, orgId)

models/good_models.go

@@ -35,17 +35,19 @@ func (NewGoodsType) TableName() string {
 }
 
 type GoodInfo struct {
-	ID                          int64                `gorm:"column:id" json:"id" form:"id"`
-	GoodCode                    string               `gorm:"column:good_code" json:"good_code" form:"good_code"`
-	SpecificationName           string               `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
-	GoodTypeId                  int64                `gorm:"column:good_type_id" json:"good_type_id" form:"good_type_id"`
-	GoodUnit                    int64                `gorm:"column:good_unit" json:"good_unit" form:"good_unit"`
-	BuyPrice                    float64              `gorm:"column:buy_price" json:"buy_price" form:"buy_price"`
-	SellPrice                   float64              `gorm:"column:sell_price" json:"sell_price" form:"sell_price"`
-	Remark                      string               `gorm:"column:remark" json:"remark" form:"remark"`
-	Ctime                       int64                `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime                       int64                `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	Manufacturer                int64                `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	ID                int64        `gorm:"column:id" json:"id" form:"id"`
+	GoodCode          string       `gorm:"column:good_code" json:"good_code" form:"good_code"`
+	SpecificationName string       `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
+	GoodTypeId        int64        `gorm:"column:good_type_id" json:"good_type_id" form:"good_type_id"`
+	GoodUnit          int64        `gorm:"column:good_unit" json:"good_unit" form:"good_unit"`
+	BuyPrice          float64      `gorm:"column:buy_price" json:"buy_price" form:"buy_price"`
+	SellPrice         float64      `gorm:"column:sell_price" json:"sell_price" form:"sell_price"`
+	Remark            string       `gorm:"column:remark" json:"remark" form:"remark"`
+	Ctime             int64        `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime             int64        `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Manufacturer      int64        `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	Manufacturers     Manufacturer `gorm:"ForeignKey:ID;AssociationForeignKey:Manufacturer" json:"Manufacturer"`
+
 	Dealer                      int64                `gorm:"column:dealer" json:"dealer" form:"dealer"`
 	ExpiryDateWarnDayCount      int64                `gorm:"column:expiry_date_warn_day_count" json:"expiry_date_warn_day_count" form:"expiry_date_warn_day_count"`
 	StockWarnCount              int64                `gorm:"column:stock_warn_count" json:"stock_warn_count" form:"stock_warn_count"`