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

controllers/supply_order_api_contorller.go

@@ -20,11 +20,11 @@ type SupplyOrderApiController struct {
 }
 
 func SupplyOrderApiRegistRouters() {
-	//获取供应商列表GetSupplyList
+	//获取供应商列表(orgid)
 	beego.Router("/api/supply/getsupplylist", &SupplyOrderApiController{}, "get:GetSupplyList")
-	//保存供应商及联系人（用于更改）
+	//保存供应商及联系人（用于更改N）
 	beego.Router("/api/supply/updatesupply", &SupplyOrderApiController{}, "post:UpdateSupply")
-	//删除单条联系人
+	//删除单条联系人(N)
 	beego.Router("/api/supply/delcontactone", &SupplyOrderApiController{}, "get:DelContactOne")
 	//获取单条供应商和涉及到的联系人记录
 	beego.Router("/api/supply/getsupplyandcontactone", &SupplyOrderApiController{}, "get:GetSupplyAndContactOne")
@@ -138,7 +138,7 @@ func (this *SupplyOrderApiController) GetSupplyList() {
 	keyword := this.GetString("keyword") //供应商编号\供应商名称\联系人名字
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 	//获取分页的数据
-	list, total, err := service.GetSupplyList(ctype, page, limit, keyword)
+	list, total, err := service.GetSupplyList(ctype, page, limit, keyword, orgId)
 	//获取供应商类别
 	costClassify := "供应商类别"
 	drugTypeParent, _ := service.GetDrugDataConfig(0, costClassify)
@@ -154,7 +154,7 @@ func (this *SupplyOrderApiController) GetSupplyList() {
 	if err == nil {
 		for i := 0; i < len(list); i++ {
 			code := list[i].SupplierCode
-			fistname, errs := service.FindName(code)
+			fistname, errs := service.FindName(code, orgId)
 			if errs != nil && errs.Error() != "record not found" {
 				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 				return
@@ -217,6 +217,7 @@ func (this *SupplyOrderApiController) GetSupplyList() {
 
 //保存供应商及联系人（用于更改）
 func (this *SupplyOrderApiController) UpdateSupply() {
+	orgId := this.GetAdminUserInfo().CurrentOrgId
 	dataBody := make(map[string]interface{}, 0)
 	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
 	if err != nil {
@@ -254,7 +255,7 @@ func (this *SupplyOrderApiController) UpdateSupply() {
 	}
 	if supplierName != supply.SupplierName {
 		//判断供应商名称是否有重复的
-		sbool, _ := service.FindSupplierName(supplierName)
+		sbool, _ := service.FindSupplierName(supplierName, orgId)
 		if sbool { //有重复的
 			this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "供应商名称重复")
 			return
@@ -262,7 +263,7 @@ func (this *SupplyOrderApiController) UpdateSupply() {
 	}
 	if supplierCode != supply.SupplierCode {
 		//判断供应商编号是否有重复的
-		codebool, _ := service.FindSupplierCode(supplierCode)
+		codebool, _ := service.FindSupplierCode(supplierCode, supplierid, orgId)
 		if codebool {
 			this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "供应商编号重复")
 			return
@@ -285,7 +286,6 @@ func (this *SupplyOrderApiController) UpdateSupply() {
 	bank := dataBody["bank"].(string) //纳税人识别号
 	//bankAccount := this.GetString("bankAccount")     //银行账号
 	bankAccount := dataBody["bankaccount"].(string)
-	orgId := this.GetAdminUserInfo().CurrentOrgId
 	//contacts := this.Get("contacts")//联系人
 	//dataBody := make(map[string]interface{}, 0)
 	//err = json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
@@ -323,6 +323,7 @@ func (this *SupplyOrderApiController) UpdateSupply() {
 
 //获取单条供应商和涉及到的联系人记录
 func (this *SupplyOrderApiController) GetSupplyAndContactOne() {
+	orgId := this.GetAdminUserInfo().CurrentOrgId
 	id, _ := this.GetInt64("id")
 	check := map[string][]string{
 		"id": {"must", "string", "id"},
@@ -335,9 +336,8 @@ func (this *SupplyOrderApiController) GetSupplyAndContactOne() {
 	//	this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "供应商id不能为空")
 	//	return
 	//}
-	supply, contact, err := service.GetSupplyAndContactOne(id)
+	supply, contact, err := service.GetSupplyAndContactOne(id, orgId)
 	//获取供应商类别
-	orgId := this.GetAdminUserInfo().CurrentOrgId
 	costClassify := "供应商类别"
 	drugTypeParent, _ := service.GetDrugDataConfig(0, costClassify)
 	drugTypeList, _ := service.GetParentDataConfig(drugTypeParent.ID, orgId)
@@ -451,7 +451,8 @@ func (this *SupplyOrderApiController) DelContactOne() {
 
 //获取供应商编码
 func (this *SupplyOrderApiController) GetSupplyCode() {
-	supply, err := service.GetSuppliyCode()
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	supply, err := service.GetSuppliyCode(orgId)
 	if err != nil {
 		return
 	}
@@ -483,6 +484,7 @@ func (this *SupplyOrderApiController) GetSupplyCode() {
 
 //保存供应商
 func (this *SupplyOrderApiController) SaveSupply() {
+	orgId := this.GetAdminUserInfo().CurrentOrgId
 	//supplierName := this.GetString("suppliername") //供应商名称
 	dataBody := make(map[string]interface{}, 0)
 	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
@@ -497,7 +499,7 @@ func (this *SupplyOrderApiController) SaveSupply() {
 		return
 	}
 	//判断供应商名称是否有重复的
-	sbool, _ := service.FindSupplierName(supplierName)
+	sbool, _ := service.FindSupplierName(supplierName, orgId)
 	if sbool { //有重复的
 		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "供应商名称重复")
 		return
@@ -509,7 +511,7 @@ func (this *SupplyOrderApiController) SaveSupply() {
 		return
 	}
 	//判断供应商编号是否有重复的
-	codebool, _ := service.FindSupplierCode(supplierCode)
+	codebool, _ := service.FindSupplierCodes(supplierCode, orgId)
 	if codebool {
 		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "供应商编号重复")
 		return
@@ -528,14 +530,14 @@ func (this *SupplyOrderApiController) SaveSupply() {
 	}
 	supplierType := int64(dataBody["suppliertype"].(float64)) //供应商类别
 	//vatRate, _ := this.GetFloat("vatrate")
-	vatRate, _ := dataBody["suppliertype"].(float64) //增值税税率
+	vatRate, _ := dataBody["vatrate"].(float64) //增值税税率
 	//number := this.GetString("number")
 	number := dataBody["number"].(string)
 	//bank := this.GetString("bank")
 	bank := dataBody["bank"].(string)
 	//bankAccount := this.GetString("bankAccount")
 	bankAccount := dataBody["bankaccount"].(string)
-	orgId := this.GetAdminUserInfo().CurrentOrgId
+
 	//contacts := this.Get("contacts")//联系人
 	//err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
 	//if err != nil {

service/supply_service.go

@@ -8,14 +8,14 @@ import (
 )
 
 //根据供应商编号获取首要联系人
-func FindName(code string) (fistname models.SpSupplierContacts, err error) {
-	err = XTReadDB().Model(&models.SpSupplierContacts{}).Where("supplier_code = ? and status = 1", code).First(&fistname).Error
+func FindName(code string, orgid int64) (fistname models.SpSupplierContacts, err error) {
+	err = XTReadDB().Model(&models.SpSupplierContacts{}).Where("supplier_code = ? and status = 1 and is_first = 1 and user_org_id = ?", code, orgid).First(&fistname).Error
 	return fistname, err
 }
 
 //供应商分页
-func GetSupplyList(ctype int64, page int64, limit int64, keyword string) (supplylist []*models.SpSupplierName, total int64, err error) {
-	db := XTReadDB().Model(&supplylist).Where("xt_supplier_name.status = 1 ")
+func GetSupplyList(ctype int64, page int64, limit int64, keyword string, orgid int64) (supplylist []*models.SpSupplierName, total int64, err error) {
+	db := XTReadDB().Model(&supplylist).Where("xt_supplier_name.status = 1 and xt_supplier_name.user_org_id = ?", orgid)
 
 	offset := (page - 1) * limit
 
@@ -99,7 +99,7 @@ func UpdateSupplyAndContact(thisStockIn []interface{}, suid, orgId, supplierType
 		if isfirst == 1 {
 			if id == 0 {
 				var spconid []*models.SpSupplierContacts
-				spconid, err = SaveContactsId(tx)
+				spconid, err = SaveContactsId(tx, orgId)
 				if err != nil {
 					return err
 				}
@@ -158,10 +158,10 @@ func DelContactOne(id int64) error {
 }
 
 //获取单条供应商和涉及到的联系人记录
-func GetSupplyAndContactOne(id int64) (supply models.SpSupplierName, contact []*models.SpSupplierContacts, err error) {
-	err = XTReadDB().Model(&models.SpSupplierName{}).Where("id = ? and status = 1", id).First(&supply).Error
+func GetSupplyAndContactOne(id, orgId int64) (supply models.SpSupplierName, contact []*models.SpSupplierContacts, err error) {
+	err = XTReadDB().Model(&models.SpSupplierName{}).Where("id = ? and status = 1 and user_org_id = ?", id, orgId).First(&supply).Error
 	code := supply.SupplierCode
-	err = XTReadDB().Model(&models.SpSupplierContacts{}).Where("supplier_code = ? and status = 1", code).Find(&contact).Error
+	err = XTReadDB().Model(&models.SpSupplierContacts{}).Where("supplier_code = ? and status = 1 and user_org_id = ?", code, orgId).Find(&contact).Error
 	return supply, contact, err
 }
 
@@ -212,7 +212,7 @@ func SaveSupplyAndContact(thisStockIn []interface{}, orgId, supplierType, tcreat
 		err = SaveContacts(spcontacts, tx)
 		if isfirst == 1 {
 			var spconid []*models.SpSupplierContacts
-			spconid, err = SaveContactsId(tx)
+			spconid, err = SaveContactsId(tx, orgId)
 			if err != nil {
 				return err
 			}
@@ -247,14 +247,13 @@ 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%' and status = 1 ").Order("supplier_code desc").First(&spcode).Error
+func GetSuppliyCode(orgId int64) (spcode []*models.SpSupplierName, err error) {
+	err = XTReadDB().Model(&models.SpSupplierName{}).Select("supplier_code").Where("supplier_code like 'gys%' and status = 1 and user_org_id = ? ", orgId).Order("supplier_code desc").First(&spcode).Error
 	return spcode, err
 }
 
 //查询供应商的名字是否有重复
-func FindSupplierName(supplierName string) (sbool bool, err error) {
+func FindSupplierName(supplierName string, orgId int64) (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 {
@@ -265,11 +264,23 @@ func FindSupplierName(supplierName string) (sbool bool, err error) {
 	return sbool, err
 }
 
-//查询供应商的编号是否有重复
-func FindSupplierCode(supplierCode string) (codebool bool, err error) {
+//查询供应商的编号是否有重复(用于修改)
+func FindSupplierCode(supplierCode string, supplierid, orgid int64) (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 {
+	err = XTReadDB().Model(&models.SpSupplierName{}).Where("supplier_code = ? and id != ? and user_org_id = ? and status = 1", supplierCode, supplierid, orgid).Count(&total).Error
+	if total > 0 {
+		codebool = true
+	} else {
+		codebool = false
+	}
+	return codebool, err
+}
+
+//查询供应商的编号是否有重复（用于新增）
+func FindSupplierCodes(supplierCode string, orgid int64) (codebool bool, err error) {
+	var total int
+	err = XTReadDB().Model(&models.SpSupplierName{}).Where("supplier_code = ? and status = 1 and user_org_id = ?", supplierCode, orgid).Count(&total).Error
+	if total > 0 {
 		codebool = true
 	} else {
 		codebool = false
@@ -284,8 +295,8 @@ 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").Where("status = 1").Order("id desc").First(&spconid).Error
+func SaveContactsId(tx *gorm.DB, orgid int64) (spconid []*models.SpSupplierContacts, err error) {
+	err = tx.Model(&models.SpSupplierContacts{}).Select("id").Where("status = 1 and user_org_id = ?", orgid).Order("id desc").First(&spconid).Error
 	return
 }