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

controllers/supply_order_api_contorller.go

 }
 
 func SupplyOrderApiRegistRouters() {
-	//获取供应商列表(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")
 	if err != nil {
 		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
 	}
-	//if page == 0 || limit == 0 {
-	//	this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "page或limit参数不能为空")
-	//	return
-	//}
 	keyword := this.GetString("keyword") //供应商编号\供应商名称\联系人名字
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 	//获取分页的数据
 				phonemap[list[i].SupplierCode],
 			}
 			tmplist = append(tmplist, tlist)
-
 		}
 		this.ServeSuccessJSON(map[string]interface{}{
 			"list":  tmplist,
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
-
 	supplierName := dataBody["suppliername"].(string)
 	if supplierName == "" {
 		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "供应商名称不能为空")
 		return
 	}
-	//upplierCode := this.GetString("suppliercode") //供应商编码
 	supplierCode := dataBody["suppliercode"].(string)
 	if supplierCode == "" {
 		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "供应商编号不能为空")
 			return
 		}
 	}
-	//supplierType, _ := this.GetInt64("suppliertype") //供应商类别
 	if dataBody["suppliertype"] == "" || dataBody["suppliertype"] == 0 {
 		var tmp float64 = 0
 		dataBody["suppliertype"] = tmp
 	case string:
 		tmpvarrate, _ = strconv.ParseFloat(dataBody["vatrate"].(string), 64)
 	}
-	vatRate := tmpvarrate //增值税税率
-	//number := this.GetString("number")               //纳税人识别号
-	number := dataBody["number"].(string) //纳税人识别号
-	//bank := this.GetString("bank")                   //开户银行
-	bank := dataBody["bank"].(string) //纳税人识别号
-	//bankAccount := this.GetString("bankAccount")     //银行账号
-	bankAccount := dataBody["bankaccount"].(string)
+	vatRate := tmpvarrate                           //增值税税率
+	number := dataBody["number"].(string)           //纳税人识别号
+	bank := dataBody["bank"].(string)               //开户银行
+	bankAccount := dataBody["bankaccount"].(string) //银行账号
 	tmodify := this.GetAdminUserInfo().AdminUser.Id //修改者
 	//保存联系人
 	if dataBody["contacts"] != nil && reflect.TypeOf(dataBody["contacts"]).String() == "[]interface {}" {
 	if err != nil {
 		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
 	}
-	//if id == 0 {
-	//	this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "供应商id不能为空")
-	//	return
-	//}
 	supply, contact, err := service.GetSupplyAndContactOne(id, orgId)
 	//获取供应商类别
 	costClassify := "供应商类别"
 func (this *SupplyOrderApiController) DelContactOne() {
 	id, _ := this.GetInt64("id")
 	if id == 0 {
-		//this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "联系人id不能为空")
 		this.ServeSuccessJSON(map[string]interface{}{
 			"list": "删除成功,没有走数据库",
 		})
 		return
 	}
 	if len(supply) == 0 { //如果数据库中没有gys类型的编码则设置默认值
-		//supply[0].SupplierCode ="gys001"
 		supply = []*models.SpSupplierName{
 			{
 				SupplierCode: "gys001",
 	return
 }
 
-//保存供应商
+//保存供应商（用于新增）
 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)
 	if err != nil {
 		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "供应商名称重复")
 		return
 	}
-	//supplierCode := this.GetString("suppliercode") //供应商编码
 	supplierCode := dataBody["suppliercode"].(string) //供应商编码
 	if supplierCode == "" {
 		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "供应商编号不能为空")
 	if dataBody["vatrate"] == "" {
 		dataBody["vatrate"] = "0"
 	}
-	//supplierType, _ := this.GetInt64("suppliertype")
 	if dataBody["suppliertype"] == "" || dataBody["suppliertype"] == 0 {
 		var tmp float64 = 0
 		dataBody["suppliertype"] = tmp
 	}
 	supplierType := int64(dataBody["suppliertype"].(float64)) //供应商类别
-	//vatRate, _ := this.GetFloat("vatrate")
 	var tmpvarrate float64
 	datavarrate := dataBody["vatrate"]
 	switch datavarrate.(type) {
 		tmpvarrate, _ = strconv.ParseFloat(dataBody["vatrate"].(string), 64)
 	}
 	vatRate := tmpvarrate //增值税税率
-	//number := dataBody["number"].(string)
 	number, _ := dataBody["number"].(string)
-	//bank := this.GetString("bank")
 	bank := dataBody["bank"].(string)
-	//bankAccount := this.GetString("bankAccount")
 	bankAccount := dataBody["bankaccount"].(string)
 	tcreater := this.GetAdminUserInfo().AdminUser.Id
 	//保存联系人

service/supply_service.go

 //供应商分页
 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
-
 	if len(keyword) > 0 {
 		keyword = "%" + keyword + "%" //联系人
 		db = db.Joins("join xt_supplier_contacts on xt_supplier_contacts.supplier_code = xt_supplier_name.supplier_code")
 			var tmp float64 = 0
 			items["id"] = tmp
 		}
-		//id, _ := strconv.ParseInt(items["id"].(string), 10, 64)
 		id := int64(items["id"].(float64))
 		name := items["name"].(string)
 		phone := items["phone"].(string)
 		address := items["address"].(string)
 		var tmpfirst int64
-		//tmptype :=  reflect.TypeOf(items["is_first"])
 		switch items["is_first"].(type) {
 		case int:
 			var aint int = items["is_first"].(int)
 //查询供应商的名字是否有重复
 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
+	err = XTReadDB().Model(&models.SpSupplierName{}).Where("supplier_name = ? and user_org_id = ? and status = 1", supplierName, orgId).Count(&total).Error
 	if total != 0 {
 		sbool = true
 	} else {
 
 func UpdateGoodWarehouseOutOrder(order *models.SpSupplierWarehousingOutOrder) error {
 
-	err := XTWriteDB().Model(&order).Where("id = ? and status = 1", order.ID).Updates(map[string]interface{}{"project_id": order.ProjectId, "is_source": order.IsSource, "count": order.Count, "price": order.Count, "remark": order.Remark, "supply_batch_number": order.SupplyBatchNumber, "supply_product_date": order.SupplyProductDate, "supply_expiry_date": order.SupplyExpiryDate, "supply_type": order.SupplyType, "supply_specification_name": order.SupplySpecificationName, "supply_total": order.SupplyTotal, "supply_manufacturer": order.SupplyManufacturer, "name": order.Name, "supply_unit": order.SupplyUnit, "manufacturer_id": order.ManufacturerId, "supply_license_number": order.SupplyLicenseNumber, "warehousing_id": order.WarehousingId, "warehouse_info_id": order.WarehouseInfoId, "min_price": order.MinPrice}).Error
+	err := XTWriteDB().Model(&order).Where("id = ? and status = 1", order.ID).Updates(map[string]interface{}{"project_id": order.ProjectId, "is_source": order.IsSource, "count": order.Count, "price": order.Price, "remark": order.Remark, "supply_batch_number": order.SupplyBatchNumber, "supply_product_date": order.SupplyProductDate, "supply_expiry_date": order.SupplyExpiryDate, "supply_type": order.SupplyType, "supply_specification_name": order.SupplySpecificationName, "supply_total": order.SupplyTotal, "supply_manufacturer": order.SupplyManufacturer, "name": order.Name, "supply_unit": order.SupplyUnit, "manufacturer_id": order.ManufacturerId, "supply_license_number": order.SupplyLicenseNumber, "warehousing_id": order.WarehousingId, "warehouse_info_id": order.WarehouseInfoId, "min_price": order.MinPrice}).Error
 	return err
 }