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

controllers/supply_order_api_contorller.go

@@ -183,17 +183,26 @@ func (this *SupplyOrderApiController) GetSupplyList() {
 
 //保存供应商及联系人（用于更改）
 func (this *SupplyOrderApiController) UpdateSupply() {
-	supplierName := this.GetString("suppliername") //供应商名称
+	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
+	}
+	supplierName := dataBody["suppliername"].(string)
 	if supplierName == "" {
 		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "供应商名称不能为空")
 		return
 	}
-	supplierCode := this.GetString("suppliercode") //供应商编码
+	//upplierCode := this.GetString("suppliercode") //供应商编码
+	supplierCode := dataBody["suppliercode"].(string)
 	if supplierCode == "" {
 		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "供应商编号不能为空")
 		return
 	}
-	supplierid, _ := this.GetInt64("id") //供应商id
+	//supplierid, _ := this.GetInt64("id") //供应商id
+	supplierid := int64(dataBody["id"].(float64))
 	if supplierid == 0 {
 		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "供应商id不能为空")
 		return
@@ -221,20 +230,25 @@ func (this *SupplyOrderApiController) UpdateSupply() {
 			return
 		}
 	}
-	supplierType, _ := this.GetInt64("suppliertype") //供应商类别
-	vatRate, _ := this.GetFloat("vatrate")           //增值税税率
-	number := this.GetString("number")               //纳税人识别号
-	bank := this.GetString("bank")                   //开户银行
-	bankAccount := this.GetString("bankAccount")     //银行账号
+	//supplierType, _ := this.GetInt64("suppliertype") //供应商类别
+	supplierType := int64(dataBody["suppliertype"].(float64)) //供应商类别
+	//vatRate, _ := this.GetFloat("vatrate")           //增值税税率
+	vatRate, _ := dataBody["suppliertype"].(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")//联系人
-	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
-	}
+	//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{})
@@ -242,7 +256,7 @@ func (this *SupplyOrderApiController) UpdateSupply() {
 			if len(thisStockIn) == 1 {
 				for _, item := range thisStockIn {
 					items := item.(map[string]interface{})
-					items["IsFirst"] = 1
+					items["isfirst"] = 1
 				}
 			}
 			tmodify := this.GetAdminUserInfo().AdminUser.Id
@@ -370,7 +384,15 @@ func (this *SupplyOrderApiController) GetSupplyCode() {
 
 //保存供应商
 func (this *SupplyOrderApiController) SaveSupply() {
-	supplierName := this.GetString("suppliername") //供应商名称
+	//supplierName := this.GetString("suppliername") //供应商名称
+	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
+	}
+	supplierName := dataBody["suppliername"].(string)
 	if supplierName == "" {
 		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "供应商名称不能为空")
 		return
@@ -381,7 +403,8 @@ func (this *SupplyOrderApiController) SaveSupply() {
 		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "供应商名称重复")
 		return
 	}
-	supplierCode := this.GetString("suppliercode") //供应商编码
+	//supplierCode := this.GetString("suppliercode") //供应商编码
+	supplierCode := dataBody["suppliercode"].(string) //供应商编码
 	if supplierCode == "" {
 		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "供应商编号不能为空")
 		return
@@ -392,20 +415,24 @@ func (this *SupplyOrderApiController) SaveSupply() {
 		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")     //银行账号
+	//supplierType, _ := this.GetInt64("suppliertype") //供应商类别
+	supplierType, _ := dataBody["suppliertype"].(int64) //供应商类别
+	//vatRate, _ := this.GetFloat("vatrate")           //增值税税率
+	vatRate, _ := dataBody["suppliertype"].(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")//联系人
-	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
-	}
+	//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{})
@@ -413,7 +440,7 @@ func (this *SupplyOrderApiController) SaveSupply() {
 			if len(thisStockIn) == 1 {
 				for _, item := range thisStockIn {
 					items := item.(map[string]interface{})
-					items["IsFirst"] = 1
+					items["isfirst"] = 1
 				}
 			}
 			tcreater := this.GetAdminUserInfo().AdminUser.Id