添加了供应商相关的接口

controllers/supply_order_api_contorller.go

@@ -19,7 +19,12 @@ type SupplyOrderApiController struct {
 }
 
 func SupplyOrderApiRegistRouters() {
-
+	//删除单条联系人
+	beego.Router("/api/supply/delcontactone", &SupplyOrderApiController{}, "get:DelContactOne")
+	//获取单条供应商记录
+	beego.Router("/api/supply/getsupplyone", &SupplyOrderApiController{}, "get:GetSupplyOne")
+	//获取供应商类别
+	beego.Router("/api/supply/getsupplytype", &SupplyOrderApiController{}, "get:GetSupplyType")
 	//删除供应商及联系人
 	beego.Router("/api/supply/delsupply", &SupplyOrderApiController{}, "post:DelSupply")
 	//获取供应商编码
@@ -62,6 +67,38 @@ func SupplyOrderApiRegistRouters() {
 	beego.Router("/api/supply/getgoodordercountlist", &SupplyOrderApiController{}, "Get:GetGoodOrderCountList")
 }
 
+//获取单条供应商记录
+func (this *SupplyOrderApiController) GetSupplyOne() {
+	id, _ := this.GetInt64("id")
+	if id == 0 {
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "供应商id不能为空")
+		return
+	}
+	supply, contact, err := service.GetSupplyOne(id)
+	if err != nil {
+		utils.ErrorLog(err.Error())
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"supply":  supply,
+		"contact": contact,
+	})
+	return
+}
+
+//获取供应商类别
+func (this *SupplyOrderApiController) GetSupplyType() {
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	costClassify := "供应商类别"
+	drugTypeParent, _ := service.GetDrugDataConfig(0, costClassify)
+	drugTypeList, _ := service.GetParentDataConfig(drugTypeParent.ID, orgId)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": drugTypeList,
+	})
+	return
+}
+
 //删除供应商及联系人
 func (this *SupplyOrderApiController) DelSupply() {
 	//拿到供应商的id
@@ -85,6 +122,25 @@ func (this *SupplyOrderApiController) DelSupply() {
 	return
 }
 
+//删除单条联系人记录
+func (this *SupplyOrderApiController) DelContactOne() {
+	id, _ := this.GetInt64("id")
+	if id == 0 {
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "联系人id不能为空")
+		return
+	}
+	err := service.DelContactOne(id)
+	if err != nil {
+		utils.ErrorLog(err.Error())
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": "删除成功",
+	})
+	return
+}
+
 //获取供应商编码
 func (this *SupplyOrderApiController) GetSupplyCode() {
 	supply, err := service.GetSuppliyCode()
@@ -135,6 +191,11 @@ func (this *SupplyOrderApiController) SaveSupply() {
 		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "供应商编号不能为空")
 		return
 	}
+	//判断供应商编号是否有重复的
+	codebool, _ := service.FindSupplierCode(supplierCode)
+	if codebool {
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "供应商编号重复")
+	}
 	supplierType, _ := this.GetInt64("suppliertype") //供应商类别
 	vatRate, _ := this.GetFloat("vatrate")           //增值税税率
 	number := this.GetString("number")               //纳税人识别号

models/supply.models.go

@@ -2,15 +2,16 @@ package models
 
 //供应商联系人
 type SpSupplierContacts struct {
-	ID        int64  `gorm:"column:id" json:"id" from:"id"`
-	Name      string `gorm:"column:name" json:"name" from:"name"`
-	Phone     string `gorm:"column:phone" json:"phone" from:"phone"`
-	Address   string `gorm:"column:address" json:"address" from:"address"`
-	IsFirst   int64  `gorm:"column:is_first" json:"is_first" from:"is_first"`
-	UserOrgId int64  `gorm:"column:user_org_id" json:"user_org_id" from:"user_org_id"`
-	Status    int64  `gorm:"column:status" json:"status" from:"status"`
-	Ctime     int64  `gorm:"column:ctime" json:"ctime" from:"ctime"`
-	Mtime     int64  `gorm:"column:mtime" json:"mtime" from:"mtime"`
+	ID           int64  `gorm:"column:id" json:"id" from:"id"`
+	Name         string `gorm:"column:name" json:"name" from:"name"`
+	Phone        string `gorm:"column:phone" json:"phone" from:"phone"`
+	Address      string `gorm:"column:address" json:"address" from:"address"`
+	IsFirst      int64  `gorm:"column:is_first" json:"is_first" from:"is_first"`
+	SupplierCode string `gorm:"column:supplier_code" json:"supplier_code" from:"supplier_code"`
+	UserOrgId    int64  `gorm:"column:user_org_id" json:"user_org_id" from:"user_org_id"`
+	Status       int64  `gorm:"column:status" json:"status" from:"status"`
+	Ctime        int64  `gorm:"column:ctime" json:"ctime" from:"ctime"`
+	Mtime        int64  `gorm:"column:mtime" json:"mtime" from:"mtime"`
 }
 
 func (SpSupplierContacts) TableName() string {

service/supply_service.go

@@ -7,6 +7,20 @@ import (
 	"time"
 )
 
+//删除单条联系人记录
+func DelContactOne(id int64) error {
+	err := XTWriteDB().Model(&models.SpSupplierContacts{}).Where("id = ?", id).Update("status", 0).Error
+	return err
+}
+
+//获取单条供应商记录
+func GetSupplyOne(id int64) (supply models.SpSupplierName, contact []*models.SpSupplierContacts, err error) {
+	err = XTReadDB().Model(&models.SpSupplierName{}).Where("id = ? and status = 1", id).First(&supply).Error
+	code := supply.SupplierCode
+	err = XTReadDB().Model(&models.SpSupplierContacts{}).Where("supplier_code = ? and status = 1", code).Find(&contact).Error
+	return supply, contact, err
+}
+
 //删除供应商及联系人
 func DelSupply(supply models.SpSupplierName) error {
 	err := XTWriteDB().Model(&supply).Update("status", 0).Error
@@ -31,14 +45,15 @@ func SaveSupplyAndContact(thisStockIn []interface{}, orgId, supplierType, tcreat
 		isfirst, _ := strconv.ParseInt(items["isfirst"].(string), 10, 64)
 
 		spcontacts := models.SpSupplierContacts{
-			Name:      name,
-			Phone:     phone,
-			Address:   address,
-			IsFirst:   isfirst,
-			UserOrgId: orgId,
-			Status:    1,
-			Ctime:     time.Now().Unix(),
-			Mtime:     0,
+			Name:         name,
+			Phone:        phone,
+			Address:      address,
+			IsFirst:      isfirst,
+			SupplierCode: supplierCode,
+			UserOrgId:    orgId,
+			Status:       1,
+			Ctime:        time.Now().Unix(),
+			Mtime:        0,
 		}
 		err = SaveContacts(spcontacts, tx)
 		if isfirst == 1 {
@@ -82,7 +97,7 @@ func SaveSupplyAndContact(thisStockIn []interface{}, orgId, supplierType, tcreat
 //获取供应商编码
 func GetSuppliyCode() (spcode []*models.SpSupplierName, err error) {
 
-	err = XTReadDB().Model(&models.SpSupplierName{}).Select("supplier_code").Where("supplier_code like 'gys%' ").Order("supplier_code desc").First(&spcode).Error
+	err = XTReadDB().Model(&models.SpSupplierName{}).Select("supplier_code").Where("supplier_code like 'gys%' and status = 1 ").Order("supplier_code desc").First(&spcode).Error
 	return spcode, err
 }
 
@@ -98,6 +113,18 @@ func FindSupplierName(supplierName string) (sbool bool, err error) {
 	return sbool, err
 }
 
+//查询供应商的编号是否有重复
+func FindSupplierCode(supplierCode string) (codebool bool, err error) {
+	var total int
+	err = XTReadDB().Model(&models.SpSupplierName{}).Where("supplier_name = ? and status = 1", supplierCode).Count(&total).Error
+	if total != 0 {
+		codebool = true
+	} else {
+		codebool = false
+	}
+	return codebool, err
+}
+
 //保存一条供应商数据
 func SaveSupply(supply models.SpSupplierName, tx *gorm.DB) error {
 	err := tx.Create(&supply).Error
@@ -106,7 +133,7 @@ func SaveSupply(supply models.SpSupplierName, tx *gorm.DB) error {
 
 //获取联系人的id
 func SaveContactsId(tx *gorm.DB) (spconid []*models.SpSupplierContacts, err error) {
-	err = tx.Model(&models.SpSupplierContacts{}).Select("id").Order("id desc").First(&spconid).Error
+	err = tx.Model(&models.SpSupplierContacts{}).Select("id").Where("and status = 1").Order("id desc").First(&spconid).Error
 	return
 }