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

controllers/supply_order_api_contorller.go

@@ -20,7 +20,13 @@ type SupplyOrderApiController struct {
 
 func SupplyOrderApiRegistRouters() {
 
-	//初始化商品数据
+	//删除供应商及联系人
+	beego.Router("/api/supply/delsupply", &SupplyOrderApiController{}, "post:DelSupply")
+	//获取供应商编码
+	beego.Router("/api/supply/getsupplycode", &SupplyOrderApiController{}, "get:GetSupplyCode")
+	//保存供应商及联系人
+	beego.Router("/api/supply/savesupply", &SupplyOrderApiController{}, "post:SaveSupply")
+
 	beego.Router("/api/supply/getinitorder", &SupplyOrderApiController{}, "get:GetInitOrder")
 	//保存购货订单
 	beego.Router("/api/supply/savepurchaseorder", &SupplyOrderApiController{}, "post:SavePurchaseOrder")
@@ -56,6 +62,120 @@ func SupplyOrderApiRegistRouters() {
 	beego.Router("/api/supply/getgoodordercountlist", &SupplyOrderApiController{}, "Get:GetGoodOrderCountList")
 }
 
+//删除供应商及联系人
+func (this *SupplyOrderApiController) DelSupply() {
+	//拿到供应商的id
+	suid, _ := this.GetInt64("id")
+	if suid == 0 {
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "供应商id不能为空")
+		return
+	}
+	supply := models.SpSupplierName{
+		ID: suid,
+	}
+	err := service.DelSupply(supply)
+	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()
+	if err != nil {
+		return
+	}
+	if len(supply) == 0 { //如果数据库中没有gys类型的编码则设置默认值
+		//supply[0].SupplierCode ="gys001"
+		supply = []*models.SpSupplierName{
+			{
+				SupplierCode: "gys001",
+			},
+		}
+	} else { //获取数据库中最大的编码值，并加一
+		tmp := supply[0].SupplierCode
+		tmp = tmp[3:]
+		var code int
+		code, err = strconv.Atoi(tmp)
+		code++
+		tmp = strconv.Itoa(code)
+		for len(tmp) < 3 {
+			tmp = "0" + tmp
+		}
+		tmp = "gys" + tmp
+		supply[0].SupplierCode = tmp
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"supplycode": supply,
+	})
+	return
+}
+
+//保存供应商
+func (this *SupplyOrderApiController) SaveSupply() {
+	supplierName := this.GetString("suppliername") //供应商名称
+	if supplierName == "" {
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "供应商名称不能为空")
+		return
+	}
+	//判断供应商名称是否有重复的
+	sbool, _ := service.FindSupplierName(supplierName)
+	if sbool { //有重复的
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "供应商名称重复")
+		return
+	}
+	supplierCode := this.GetString("suppliercode") //供应商编码
+	if supplierCode == "" {
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "供应商编号不能为空")
+		return
+	}
+	supplierType, _ := this.GetInt64("suppliertype") //供应商类别
+	vatRate, _ := this.GetFloat("vatrate")           //增值税税率
+	number := this.GetString("number")               //纳税人识别号
+	bank := this.GetString("bank")                   //开户银行
+	bankAccount := this.GetString("bankAccount")     //银行账号
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	//contacts := this.Get("contacts")//联系人
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
+	if err != nil {
+		utils.ErrorLog(err.Error())
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	//保存联系人
+	if dataBody["contacts"] != nil && reflect.TypeOf(dataBody["contacts"]).String() == "[]interface {}" {
+		thisStockIn, _ := dataBody["contacts"].([]interface{})
+		if len(thisStockIn) > 0 {
+			if len(thisStockIn) == 1 {
+				for _, item := range thisStockIn {
+					items := item.(map[string]interface{})
+					items["IsFirst"] = 1
+				}
+			}
+			tcreater := this.GetAdminUserInfo().AdminUser.Id
+			err = service.SaveSupplyAndContact(thisStockIn, orgId, supplierType, tcreater, supplierCode, supplierName, number, bank, bankAccount, vatRate)
+			if err != nil {
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+		} else {
+			this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "联系人不能为空")
+			return
+		}
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": "保存成功",
+	})
+	return
+}
+
 func (this *SupplyOrderApiController) GetInitOrder() {
 
 	orgId := this.GetAdminUserInfo().CurrentOrgId

models/supply.models.go

@@ -1,5 +1,22 @@
 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"`
+}
+
+func (SpSupplierContacts) TableName() string {
+	return "xt_supplier_contacts"
+}
+
 type SpBaseDrug struct {
 	ID                int64                  `gorm:"column:id" json:"id" form:"id"`
 	DrugName          string                 `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
@@ -80,7 +97,7 @@ type SpSupplierName struct {
 	BankAccount  string  `gorm:"column:bank_account" json:"bank_account" form:"bank_account"`
 	UserOrgId    int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
 	Status       int64   `gorm:"column:status" json:"status" form:"status"`
-	ContactsId   string  `gorm:"column:contacts_id" json:"contacts_id" form:"contacts_id"`
+	ContactsId   int64   `gorm:"column:contacts_id" json:"contacts_id" form:"contacts_id"`
 	Ctime        int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
 	Mtime        int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
 	Creater      int64   `gorm:"column:creater" json:"creater" form:"creater"`

service/supply_service.go

@@ -2,9 +2,120 @@ package service
 
 import (
 	"XT_New/models"
+	"github.com/jinzhu/gorm"
+	"strconv"
 	"time"
 )
 
+//删除供应商及联系人
+func DelSupply(supply models.SpSupplierName) error {
+	err := XTWriteDB().Model(&supply).Update("status", 0).Error
+	return err
+}
+
+//保存供应商和联系人
+func SaveSupplyAndContact(thisStockIn []interface{}, orgId, supplierType, tcreater int64, supplierCode, supplierName, number, bank, bankAccount string, vatRate float64) error {
+	tx := XTWriteDB().Begin()
+	defer func() {
+		if err != nil {
+			tx.Rollback()
+		} else {
+			tx.Commit()
+		}
+	}()
+	for _, item := range thisStockIn {
+		items := item.(map[string]interface{})
+		name := items["name"].(string)
+		phone := items["phone"].(string)
+		address := items["address"].(string)
+		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,
+		}
+		err = SaveContacts(spcontacts, tx)
+		if isfirst == 1 {
+			var spconid []*models.SpSupplierContacts
+			spconid, err = SaveContactsId(tx)
+
+			if err != nil {
+				return err
+			}
+			tmpid := spconid[0].ID
+			//保存供应商
+			supply := models.SpSupplierName{
+				SupplierCode: supplierCode,
+				SupplierName: supplierName,
+				SupplierType: supplierType,
+				VatRate:      vatRate,
+				Number:       number,
+				Bank:         bank,
+				BankAccount:  bankAccount,
+				UserOrgId:    orgId,
+				Status:       1,
+				ContactsId:   tmpid,
+				Ctime:        time.Now().Unix(),
+				Mtime:        0,
+				Creater:      tcreater,
+				Modify:       tcreater,
+			}
+			err = SaveSupply(supply, tx)
+			if err != nil {
+				return err
+			}
+
+		}
+		if err != nil {
+			return err
+		}
+	}
+	return err
+}
+
+//获取供应商编码
+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
+	return spcode, err
+}
+
+//查询供应商的名字是否有重复
+func FindSupplierName(supplierName string) (sbool bool, err error) {
+	var total int
+	err = XTReadDB().Model(&models.SpSupplierName{}).Where("supplier_name = ? and status = 1", supplierName).Count(&total).Error
+	if total != 0 {
+		sbool = true
+	} else {
+		sbool = false
+	}
+	return sbool, err
+}
+
+//保存一条供应商数据
+func SaveSupply(supply models.SpSupplierName, tx *gorm.DB) error {
+	err := tx.Create(&supply).Error
+	return err
+}
+
+//获取联系人的id
+func SaveContactsId(tx *gorm.DB) (spconid []*models.SpSupplierContacts, err error) {
+	err = tx.Model(&models.SpSupplierContacts{}).Select("id").Order("id desc").First(&spconid).Error
+	return
+}
+
+//保存一条联系人数据
+func SaveContacts(spcontacts models.SpSupplierContacts, tx *gorm.DB) error {
+	err := tx.Create(&spcontacts).Error
+	return err
+}
+
 func GetSupplyDrugList(orgid int64) (drug []*models.SpBaseDrug, err error) {
 
 	db := XTReadDB().Table("xt_base_drug as x").Where("x.status = 1")