供应商编号重复问题

controllers/supply_order_api_contorller.go

@@ -256,7 +256,7 @@ func (this *SupplyOrderApiController) UpdateSupply() {
 	}
 	if supplierCode != supply.SupplierCode {
 		//判断供应商编号是否有重复的
-		codebool, _ := service.FindSupplierCode(supplierCode)
+		codebool, _ := service.FindSupplierCode(supplierCode, supplierid)
 		if codebool {
 			this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "供应商编号重复")
 			return
@@ -503,7 +503,7 @@ func (this *SupplyOrderApiController) SaveSupply() {
 		return
 	}
 	//判断供应商编号是否有重复的
-	codebool, _ := service.FindSupplierCode(supplierCode)
+	codebool, _ := service.FindSupplierCodes(supplierCode)
 	if codebool {
 		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "供应商编号重复")
 		return

service/supply_service.go

@@ -265,14 +265,26 @@ func FindSupplierName(supplierName string) (sbool bool, err error) {
 	return sbool, err
 }
 
-//查询供应商的编号是否有重复
-func FindSupplierCode(supplierCode string) (codebool bool, err error) {
+//查询供应商的编号是否有重复(用于修改)
+func FindSupplierCode(supplierCode string, supplierid 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 {
-		codebool = false
+	err = XTReadDB().Model(&models.SpSupplierName{}).Where("supplier_code = ? and id != ? and status = 1", supplierCode, supplierid).Count(&total).Error
+	if total > 0 {
+		codebool = true
 	} else {
+		codebool = false
+	}
+	return codebool, err
+}
+
+//查询供应商的编号是否有重复（用于新增）
+func FindSupplierCodes(supplierCode string) (codebool bool, err error) {
+	var total int
+	err = XTReadDB().Model(&models.SpSupplierName{}).Where("supplier_code = ? and status = 1", supplierCode).Count(&total).Error
+	if total > 0 {
 		codebool = true
+	} else {
+		codebool = false
 	}
 	return codebool, err
 }