修改二级库bug390引起的后续bug

controllers/secondary_order_api_contorller.go

@@ -396,13 +396,13 @@ func (this *SecondaryOrderApiController) UpdateStorehouse() {
 	}
 	//判断仓库名称是否重复
 	var bo bool
-	bo, err = service.IsStorehouseName(orgId, name)
+	bo, err = service.IsStorehouseNameUp(orgId, id, name)
 	if bo == true {
 		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "该仓库已存在，请重新输入")
 		return
 	}
 	//判断仓库地址是否重复
-	bo, err = service.IsStorehouseAddress(orgId, address)
+	bo, err = service.IsStorehouseAddressUp(orgId, id, address)
 	if bo == true {
 		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "该地址已存在，请重新输入")
 		return

service/secondary_service.go

@@ -82,6 +82,32 @@ func IsStorehouseAddress(orgid int64, storehouse_address string) (bool, error) {
 	return tmp, err
 }
 
+//查询仓库名称是否重复(用于修改)
+func IsStorehouseNameUp(orgid, id int64, storehouse_name string) (bool, error) {
+	var total int
+	var tmp bool
+	err := XTReadDB().Model(&models.Storehouse{}).Where("storehouse_name = ? and user_org_id = ? and status = 1 and id != ?", storehouse_name, orgid, id).Count(&total).Error
+	if total > 0 {
+		tmp = true //有重复的
+	} else {
+		tmp = false
+	}
+	return tmp, err
+}
+
+//查询仓库地址是否重复（用于修改）
+func IsStorehouseAddressUp(orgid, id int64, storehouse_address string) (bool, error) {
+	var total int
+	var tmp bool
+	err := XTReadDB().Model(&models.Storehouse{}).Where("storehouse_address = ? and user_org_id = ? and status = 1 and id != ?", storehouse_address, orgid, id).Count(&total).Error
+	if total > 0 {
+		tmp = true //有重复的
+	} else {
+		tmp = false
+	}
+	return tmp, err
+}
+
 //新增仓库
 func AddStroehouse(storehouse models.Storehouse) error {
 	tx := XTWriteDB().Begin()