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

controllers/supply_order_api_contorller.go

@@ -90,21 +90,40 @@ func SupplyOrderApiRegistRouters() {
 	beego.Router("/api/supply/getsupplywarehouseoutbyid", &SupplyOrderApiController{}, "Get:GetSupplyWarehouseById")
 }
 
+//判断前端参数是否为空
+func CheckParams(this *SupplyOrderApiController, m *map[string][]string) (map[string]string, error) {
+	tmp := make(map[string]string)
+	for k, v := range *m {
+		t := this.GetString(k)
+		if v[0] == "must" && t == "" {
+			return nil, fmt.Errorf(v[2] + "不能为空")
+		}
+		tmp[k] = t
+	}
+	return tmp, nil
+}
+
 //获取供应商列表GetSupplyList
 func (this *SupplyOrderApiController) GetSupplyList() {
 	ctype, _ := this.GetInt64("ctype") //供应商类别
 	page, _ := this.GetInt64("page")   //页码
 	limit, _ := this.GetInt64("limit") //每一页查出来的条数
-	if page == 0 || limit == 0 {
-		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "page或limit参数不能为空")
-		return
+	check := map[string][]string{
+		"page":  {"must", "string", "page"},
+		"limit": {"must", "string", "limit"},
 	}
-	code := this.GetString("code")   //供应商编号
-	sname := this.GetString("sname") //供应商名称
-	cname := this.GetString("cname") //联系人名字
+	_, err := CheckParams(this, &check)
+	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
 	//获取分页的数据
-	list, total, err := service.GetSupplyList(ctype, page, limit, code, sname, cname)
+	list, total, err := service.GetSupplyList(ctype, page, limit, keyword)
 	//获取供应商类别
 	costClassify := "供应商类别"
 	drugTypeParent, _ := service.GetDrugDataConfig(0, costClassify)
@@ -183,7 +202,6 @@ func (this *SupplyOrderApiController) GetSupplyList() {
 
 //保存供应商及联系人（用于更改）
 func (this *SupplyOrderApiController) UpdateSupply() {
-	fmt.Printf("HAHHAH")
 	dataBody := make(map[string]interface{}, 0)
 	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
 	if err != nil {
@@ -191,6 +209,7 @@ func (this *SupplyOrderApiController) UpdateSupply() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
+
 	supplierName := dataBody["suppliername"].(string)
 	if supplierName == "" {
 		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "供应商名称不能为空")
@@ -204,9 +223,9 @@ func (this *SupplyOrderApiController) UpdateSupply() {
 	}
 	//supplierid, _ := this.GetInt64("id") //供应商id
 	//fmt.Println(dataBody["id"])
-	utils.InfoLog("+++++++++++++前++++++++++++++++++", dataBody["id"])
+	//utils.InfoLog("+++++++++++++前++++++++++++++++++", dataBody["id"])
 	supplierid := int64(dataBody["id"].(float64))
-	utils.InfoLog("+++++++++++++后++++++++++++++++++", supplierid)
+	//utils.InfoLog("+++++++++++++后++++++++++++++++++", supplierid)
 	if supplierid == 0 {
 		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "供应商id不能为空")
 		return
@@ -235,6 +254,13 @@ func (this *SupplyOrderApiController) UpdateSupply() {
 		}
 	}
 	//supplierType, _ := this.GetInt64("suppliertype") //供应商类别
+	if dataBody["suppliertype"] == "" || dataBody["suppliertype"] == 0 {
+		var tmp float64 = 0
+		dataBody["suppliertype"] = tmp
+	}
+	if dataBody["vatrate"] == "" {
+		dataBody["vatrate"] = 0
+	}
 	supplierType := int64(dataBody["suppliertype"].(float64)) //供应商类别
 	//vatRate, _ := this.GetFloat("vatrate")           //增值税税率
 	vatRate, _ := dataBody["suppliertype"].(float64) //增值税税率
@@ -260,13 +286,13 @@ func (this *SupplyOrderApiController) UpdateSupply() {
 			if len(thisStockIn) == 1 {
 				for _, item := range thisStockIn {
 					items := item.(map[string]interface{})
-					items["isfirst"] = 1
+					items["is_first"] = 1
 				}
 			}
 			tmodify := this.GetAdminUserInfo().AdminUser.Id
 			err = service.UpdateSupplyAndContact(thisStockIn, supplierid, orgId, supplierType, tmodify, supplierCode, supplierName, number, bank, bankAccount, vatRate)
 			if err != nil {
-				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				this.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
 				return
 			}
 		} else {
@@ -283,18 +309,72 @@ func (this *SupplyOrderApiController) UpdateSupply() {
 //获取单条供应商和涉及到的联系人记录
 func (this *SupplyOrderApiController) GetSupplyAndContactOne() {
 	id, _ := this.GetInt64("id")
-	if id == 0 {
-		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "供应商id不能为空")
-		return
+	check := map[string][]string{
+		"id": {"must", "string", "id"},
+	}
+	_, err := CheckParams(this, &check)
+	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 := this.GetAdminUserInfo().CurrentOrgId
+	costClassify := "供应商类别"
+	drugTypeParent, _ := service.GetDrugDataConfig(0, costClassify)
+	drugTypeList, _ := service.GetParentDataConfig(drugTypeParent.ID, orgId)
+	tmpmap := make(map[int64]string) //储存供应商类别
+	for i := 0; i < len(drugTypeList); i++ {
+		k := int64(drugTypeList[i].Value)
+		v := drugTypeList[i].Name
+		tmpmap[k] = v
+	}
+	type SpSupplierNameList struct { //基于SpSupplierName结构体修改的，为了方便前端取数据整合了一下，删除了几个用不到的字段，添加了联系人名字和供应商类别两个字段
+		Id           int64   `json:"id"`
+		Suppliercode string  `json:"suppliercode"`
+		Suppliername string  `json:"suppliername"`
+		Suppliertype int64   `json:"suppliertype"`
+		Vatrate      float64 `json:"vatrate"`
+		Number       string  `json:"number"`
+		Bank         string  `json:"bank"`
+		Bankaccount  string  `json:"bankaccount"`
+		Userorgid    int64   `json:"userorgid"`
+		Status       int64   `json:"status"`
+		Contactsid   int64   `json:"contactsid"`
+		Typename     string  `json:"typename"` //供应商类别
+	}
+
+	var typename string //类别名称
+	if supply.SupplierType == 0 {
+		typename = ""
+	} else {
+		typename = tmpmap[supply.SupplierType]
+	}
+	tlist := &SpSupplierNameList{
+		supply.ID,
+		supply.SupplierCode,
+		supply.SupplierName,
+		supply.SupplierType,
+		supply.VatRate,
+		supply.Number,
+		supply.Bank,
+		supply.BankAccount,
+		supply.UserOrgId,
+		supply.Status,
+		supply.ContactsId,
+		typename,
+	}
 	if err != nil {
 		utils.ErrorLog(err.Error())
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
+	fmt.Println(tlist)
 	this.ServeSuccessJSON(map[string]interface{}{
-		"supply":  supply,
+		"supply":  tlist,
 		"contact": contact,
 	})
 	return
@@ -419,9 +499,20 @@ func (this *SupplyOrderApiController) SaveSupply() {
 		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "供应商编号重复")
 		return
 	}
-	//supplierType, _ := this.GetInt64("suppliertype") //供应商类别
+	if dataBody["suppliertype"] == "" {
+		var tmp int64 = 0
+		dataBody["suppliertype"] = tmp
+	}
+	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")           //增值税税率
+	//vatRate, _ := this.GetFloat("vatrate")
 	vatRate, _ := dataBody["suppliertype"].(float64) //增值税税率
 	//number := this.GetString("number")
 	number := dataBody["number"].(string)
@@ -444,13 +535,13 @@ func (this *SupplyOrderApiController) SaveSupply() {
 			if len(thisStockIn) == 1 {
 				for _, item := range thisStockIn {
 					items := item.(map[string]interface{})
-					items["isfirst"] = 1
+					items["is_first"] = 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)
+				this.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
 				return
 			}
 		} else {

service/supply_service.go

@@ -3,7 +3,6 @@ package service
 import (
 	"XT_New/models"
 	"github.com/jinzhu/gorm"
-	"strconv"
 	"time"
 )
 
@@ -14,28 +13,20 @@ func FindName(code string) (fistname models.SpSupplierContacts, err error) {
 }
 
 //供应商分页
-func GetSupplyList(ctype int64, page int64, limit int64, code string, sname string, cname string) (supplylist []*models.SpSupplierName, total int64, err error) {
-	db := XTReadDB().Model(&supplylist).Where("sgj_xt.xt_supplier_name.status = 1 ")
+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 ")
 
 	offset := (page - 1) * limit
 
-	if cname != "" {
-		cname = "%" + cname + "%" //联系人
-		db = db.Joins("join sgj_xt.xt_supplier_contacts on sgj_xt.xt_supplier_contacts.supplier_code = sgj_xt.xt_supplier_name.supplier_code")
-		db = db.Where("sgj_xt.xt_supplier_contacts.name like ? and sgj_xt.xt_supplier_contacts.status = 1 ", cname).Group("sgj_xt.xt_supplier_name.id")
+	if len(keyword) > 0 {
+		keyword = "%" + keyword + "%" //联系人
+		db = db.Joins("join xt_supplier_contacts on xt_supplier_contacts.supplier_code = xt_supplier_name.supplier_code")
+		db = db.Where("xt_supplier_contacts.name like ? or xt_supplier_name.supplier_code like ? or xt_supplier_name.supplier_name like ? ", keyword, keyword, keyword).Group("xt_supplier_name.id")
 	}
 	if ctype > 0 {
-		db = db.Where("sgj_xt.xt_supplier_name.supplier_type = ?", ctype)
-	}
-	if code != "" {
-		code = "%" + code + "%" //供应商编码
-		db = db.Where("sgj_xt.xt_supplier_name.supplier_code = ?", code)
-	}
-	if sname != "" {
-		sname = "%" + sname + "%" //供应商名称
-		db = db.Where("sgj_xt.xt_supplier_name.supplier_name = ?", sname)
+		db = db.Where("xt_supplier_name.supplier_type = ?", ctype)
 	}
-	err = db.Count(&total).Offset(offset).Limit(limit).Find(&supplylist).Error
+	err = db.Count(&total).Offset(offset).Order("xt_supplier_name.id desc").Limit(limit).Find(&supplylist).Error
 	return supplylist, total, err
 }
 
@@ -52,11 +43,26 @@ func UpdateSupplyAndContact(thisStockIn []interface{}, suid, orgId, supplierType
 	for _, item := range thisStockIn {
 		items := item.(map[string]interface{})
 		//查询是否
-		id, _ := strconv.ParseInt(items["id"].(string), 10, 64)
+		if items["id"] == "" || items["id"] == 0 {
+			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)
-		isfirst, _ := strconv.ParseInt(items["isfirst"].(string), 10, 64)
+		var tmpfirst int64
+		//tmptype :=  reflect.TypeOf(items["is_first"])
+		switch items["is_first"].(type) {
+		case int:
+			var aint int = items["is_first"].(int)
+			tmpfirst = int64(aint)
+		case float64:
+			tmpfirst = int64(items["is_first"].(float64))
+		}
+		isfirst := tmpfirst
+
 		updatecontacts := models.SpSupplierContacts{
 			ID:           id,
 			Name:         name,
@@ -93,7 +99,6 @@ func UpdateSupplyAndContact(thisStockIn []interface{}, suid, orgId, supplierType
 			if id == 0 {
 				var spconid []*models.SpSupplierContacts
 				spconid, err = SaveContactsId(tx)
-
 				if err != nil {
 					return err
 				}
@@ -180,7 +185,17 @@ func SaveSupplyAndContact(thisStockIn []interface{}, orgId, supplierType, tcreat
 		name := items["name"].(string)
 		phone := items["phone"].(string)
 		address := items["address"].(string)
-		isfirst, _ := strconv.ParseInt(items["isfirst"].(string), 10, 64)
+		//isfirst := int64(items["is_first"].(float64))
+		var tmpfirst int64
+		//tmptype :=  reflect.TypeOf(items["is_first"])
+		switch items["is_first"].(type) {
+		case int:
+			var aint int = items["is_first"].(int)
+			tmpfirst = int64(aint)
+		case float64:
+			tmpfirst = int64(items["is_first"].(float64))
+		}
+		isfirst := tmpfirst
 
 		spcontacts := models.SpSupplierContacts{
 			Name:         name,
@@ -197,7 +212,6 @@ func SaveSupplyAndContact(thisStockIn []interface{}, orgId, supplierType, tcreat
 		if isfirst == 1 {
 			var spconid []*models.SpSupplierContacts
 			spconid, err = SaveContactsId(tx)
-
 			if err != nil {
 				return err
 			}
@@ -223,7 +237,6 @@ func SaveSupplyAndContact(thisStockIn []interface{}, orgId, supplierType, tcreat
 			if err != nil {
 				return err
 			}
-
 		}
 		if err != nil {
 			return err
@@ -271,7 +284,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").Where("and status = 1").Order("id desc").First(&spconid).Error
+	err = tx.Model(&models.SpSupplierContacts{}).Select("id").Where("status = 1").Order("id desc").First(&spconid).Error
 	return
 }