11月8日库存管理

models/secondary_models.go

@@ -1,23 +1,5 @@
 package models
 
-//二级仓库
-type Storehouse struct {
-	ID                int64  `gorm:"column:id" json:"id" form:"id"`
-	StorehouseCode    string `gorm:"column:storehouse_code" json:"storehouse_code" form:"storehouse_code"`             //仓库编号
-	StorehouseName    string `gorm:"column:storehouse_name" json:"storehouse_name" form:"storehouse_name"`             //仓库名称
-	StorehouseAddress string `gorm:"column:storehouse_address" json:"storehouse_address" form:"storehouse_address"`    //仓库地址
-	StorehouseStatus  int64  `gorm:"column:storehouse_status" json:"storehouse_status" form:"storehouse_status"`       //仓库状态
-	Status            int64  `gorm:"column:status" json:"status" form:"status"`                                        //数据状态
-	StorehouseAdminId int64  `gorm:"column:storehouse_admin_id" json:"storehouse_admin_id" form:"storehouse_admin_id"` //仓库管理员id
-	UserOrgId         int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	Ctime             int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime             int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
-}
-
-func (Storehouse) TableName() string {
-	return "xt_storehouse"
-}
-
 //仓库配置
 type StorehouseConfig struct {
 	ID                 int64 `gorm:"column:id" json:"id" form:"id"`
@@ -136,6 +118,7 @@ type XtStorehouseConfig struct {
 func (XtStorehouseConfig) TableName() string {
 	return "xt_storehouse_config"
 }
+
 //二级仓库
 type Storehouse struct {
 	ID                int64  `gorm:"column:id" json:"id" form:"id"`
@@ -154,72 +137,6 @@ func (Storehouse) TableName() string {
 	return "xt_storehouse"
 }
 
-//仓库配置
-type StorehouseConfig struct {
-	ID                 int64 `gorm:"column:id" json:"id" form:"id"`
-	UserOrgId          int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`                         //机构id
-	StorehouseInfo     int64 `gorm:"column:storehouse_info" json:"storehouse_info" form:"storehouse_info"`             //耗材 自动入库 的仓库id
-	StorehouseOutInfo  int64 `gorm:"column:storehouse_out_info" json:"storehouse_out_info" form:"storehouse_out_info"` //耗材 自动出库 的仓库id
-	DrugStorehouseInfo int64 `gorm:"drug_storehouse_info" json:"drug_storehouse_info" form:"drug_storehouse_info"`     //药品 自动入库 的仓库id
-	DrugStorehouseOut  int64 `gorm:"drug_storehouse_out" json:"drug_storehouse_out" form:"drug_storehouse_out"`        //药品 自动出库 的仓库id
-	Status             int64 `gorm:"status" json:"status" form:"status"`
-	Ctime              int64 `gorm:"ctime" json:"ctime" form:"ctime"`
-	Mtime              int64 `gorm:"mtime" json:"mtime" form:"mtime"`
-}
-
-func (StorehouseConfig) TableName() string {
-	return "xt_storehouse_config"
-}
-
-type App_Role_byli struct {
-	Id          int64  `gorm:"PRIMARY_KEY;AUTO_INCREMENT" json:"id"`
-	OrgId       int64  `gorm:"column:org_id" json:"org_id"`
-	AdminUserId int64  `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
-	UserName    string `gorm:"column:user_name" json:"user_name"` // 用户名称
-}
-
-func (App_Role_byli) TableName() string {
-	return "sgj_users.sgj_user_admin_role"
-}
-
-type UserOrg struct {
-	Id      int64 `gorm:"PRIMARY_KEY;AUTO_INCREMENT" json:"id"`
-	Creator int64 `gorm:"column:creator" json:"creator"`
-}
-
-func (UserOrg) TableName() string {
-	return "sgj_users.sgj_user_org"
-}
-
-//分页
-type Storehouselist struct {
-	ID                  int64  `gorm:"column:id" json:"id" form:"id"`
-	StorehouseCode      string `gorm:"column:storehouse_code" json:"storehouse_code" form:"storehouse_code"`                 //仓库编号
-	StorehouseName      string `gorm:"column:storehouse_name" json:"storehouse_name" form:"storehouse_name"`                 //仓库名称
-	StorehouseAddress   string `gorm:"column:storehouse_address" json:"storehouse_address" form:"storehouse_address"`        //仓库地址
-	StorehouseStatus    int64  `gorm:"column:storehouse_status" json:"storehouse_status" form:"storehouse_status"`           //仓库状态
-	Status              int64  `gorm:"column:status" json:"status" form:"status"`                                            //数据状态
-	StorehouseAdminId   int64  `gorm:"column:storehouse_admin_id" json:"storehouse_admin_id" form:"storehouse_admin_id"`     //仓库管理员id
-	StorehouseAdminName string `gorm:"column:storehouse_admin_name" json:"storehouse_admin_name" form:"storehouse_admin_id"` //仓库管理员名字
-	UserOrgId           int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	Ctime               int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime               int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
-}
-
-type RolePurviews struct {
-	Id         int64 `gorm:"PRIMARY_KEY;AUTO_INCREMENT"`
-	RoleId     int64
-	OrgId      int64
-	AppId      int64
-	PurviewIds string `gorm:"column:purview_ids"`
-	Status     int8   // 状态 0.无效 1.有效 2.禁用
-	CreateTime int64  `gorm:"column:ctime"` // 创建时间
-	ModifyTime int64  `gorm:"column:mtime"` // 修改时间
-	Role       Role   `gorm:"ForeignKey:RoleId;AssociationForeignKey:ID" json:"role_info"`
-}
-
-func (RolePurviews) TableName() string {
-	return "sgj_users.sgj_user_role_purview"
 type XtSecondWarehouse struct {
 	ID                int64  `gorm:"column:id" json:"id" form:"id"`
 	SecondOrderNumber string `gorm:"column:second_order_number" json:"second_order_number" form:"second_order_number"`

models/stock_models.go

@@ -141,7 +141,6 @@ type WarehousingInfo struct {
 	SupplyWarehouseId         int64       `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
 	SupplyWarehouseDetailInfo int64       `gorm:"column:supply_warehouse_detail_info" json:"supply_warehouse_detail_info" form:"supply_warehouse_detail_info"`
 	StorehouseId              int64       `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
-	StorehouseId              int64       `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
 	SecondWarehouseInfoId     int64       `gorm:"column:second_warehouse_info_id" json:"second_warehouse_info_id" form:"second_warehouse_info_id"`
 }
 
@@ -257,7 +256,6 @@ type WarehouseOutInfo struct {
 	StorehouseId            int64        `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
 	SecondWarehouseInfoId   int64        `gorm:"column:second_warehouse_info_id" json:"second_warehouse_info_id" form:"second_warehouse_info_id"`
 	AdminUserId             int64        `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
-	StorehouseId            int64        `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
 }
 
 func (WarehouseOutInfo) TableName() string {
@@ -357,6 +355,7 @@ type CancelStock struct {
 	Manufacturer      int64                `gorm:"column:manufacturer" json:"manufacturer"`
 	Type              int64                `gorm:"column:type" json:"type"`
 	XtCancelStockInfo []*XtCancelStockInfo `gorm:"ForeignKey:CancelStockId;AssociationForeignKey:ID" json:"XtCancelStockInfo"`
+	StorehouseId      int64                `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
 }
 
 func (CancelStock) TableName() string {

service/secondary_service.go

@@ -966,777 +966,7 @@ func GetStoreWarehouseOutById(id int64, orgid int64) (models.WarehouseOut, error
 	err := XTReadDB().Where("id = ? and org_id = ?", id, orgid).Find(&out).Error
 	return out, err
 }
-import (
-	"XT_New/models"
-	"XT_New/utils"
-	"fmt"
-	"github.com/jinzhu/gorm"
-	"math/rand"
-	"strconv"
-	"time"
-)
-
-//生成编号，规则为:"SH-"+4位随机数
-func CreateCode() string {
-	s := fmt.Sprintf("%04v", rand.New(rand.NewSource(time.Now().UnixNano())).Int63n(10000))
-	code := "SH-" + s
-	return code
-}
-
-//查询编号是否重复
-func FindStorehouseCode(orgid int64, code string) bool {
-	var total int
-	XTReadDB().Model(&models.Storehouse{}).Where(" storehouse_code = ? and user_org_id = ? and status = 1", code, orgid).Count(&total)
-	if total > 0 {
-		return true
-	} else {
-		return false
-	}
-}
-
-//判断仓库的库存是否为零 true为零，false不为零
-func IsStorehouseNil(id, orgid int64) bool { //根据 id gro_id 查为零的库存
-	var h, y int
-	//判断耗材是否为零
-	XTReadDB().Model(&models.WarehousingInfo{}).Where("stock_count > 0 and status = 1 and org_id = ? and storehouse_id = ?", orgid, id).Count(&h)
-	if h > 0 {
-		return false
-	}
-	//判断药品是否为零
-	XTReadDB().Model(&models.XtDrugWarehouseInfo{}).Where("stock_max_number > 0 or stock_min_number > 0 ").Where(" org_id = ? and storehouse_id = ?", orgid, id).Count(&y)
-	if y > 0 {
-		return false
-	}
-	return true
-}
-
-//修改仓库状态
-func UpdateStorehouseStatus(id int64) error {
-	err := XTWriteDB().Exec("UPDATE xt_storehouse,(SELECT CASE storehouse_status WHEN 1 THEN 0 WHEN 0 THEN 1 END AS tt FROM xt_storehouse WHERE id=?)tmp SET storehouse_status = tmp.tt where id=?", id, id).Error
-	return err
-}
-
-//删除仓库
-func DeleteStorehouse(id int64) error {
-	err := XTWriteDB().Model(&models.Storehouse{}).Where("id = ?", id).Update("status", 0).Error
-	return err
-}
-
-//查询仓库名称是否重复
-func IsStorehouseName(orgid 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", storehouse_name, orgid).Count(&total).Error
-	if total > 0 {
-		tmp = true //有重复的
-	} else {
-		tmp = false
-	}
-	return tmp, err
-}
-
-//查询仓库地址是否重复
-func IsStorehouseAddress(orgid 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", storehouse_address, orgid).Count(&total).Error
-	if total > 0 {
-		tmp = true //有重复的
-	} else {
-		tmp = false
-	}
-	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()
-	defer func() {
-		if err != nil {
-			utils.ErrorLog("新增仓库_事务失败，原因为", err)
-			tx.Rollback()
-		} else {
-			tx.Commit()
-		}
-	}()
-	//创建仓库
-	err := tx.Create(&storehouse).Error
-	if err != nil {
-		return err
-	}
-	var id models.Storehouse
-	//获取创建仓库的id
-	err = tx.Model(&models.Storehouse{}).Select("id").Where("status = 1 and user_org_id = ?", storehouse.UserOrgId).Order("id desc").First(&id).Error
-	if err != nil {
-		return err
-	}
-	//判断是否存在仓库配置
-	boolean := IsStorehouseconfigXT(storehouse.UserOrgId, tx)
-	if boolean == false {
-		//创建仓库配置
-		err = CreateStorehouseConfigXT(storehouse.UserOrgId, id.ID, tx)
-	} else {
-		utils.ErrorLog("仓库配置已存在")
-	}
-
-	return err
-}
-
-//修改仓库
-func UpdateStroehouse(storehouse models.Storehouse) error {
-	err := XTWriteDB().Model(&models.Storehouse{}).Where("id = ? and status = 1", storehouse.ID).Updates(
-		map[string]interface{}{
-			"storehouse_name":     storehouse.StorehouseName,
-			"storehouse_address":  storehouse.StorehouseAddress,
-			"storehouse_status":   storehouse.StorehouseStatus,
-			"storehouse_admin_id": storehouse.StorehouseAdminId,
-			"mtime":               storehouse.Mtime,
-		}).Error
-	return err
-}
-
-//查询一条仓库的信息
-func GetOneStorehouse(id, orgid int64) (storehouse models.Storehouse, err error) {
-	err = XTReadDB().Model(&models.Storehouse{}).Where("id = ? and user_org_id = ?", id, orgid).Find(&storehouse).Error
-	return
-}
-
-//分页
-func StorehouseList(page, limit, orgid int64, keyword string, slicekey []int64) (storehouse []models.Storehouse, total int64, err error) {
-	db := XTReadDB().Model(&storehouse).Where("status = 1 and user_org_id = ?", orgid)
-	offset := (page - 1) * limit
-	if len(keyword) > 0 {
-		var adminid string = "storehouse_code like ? or storehouse_name like ? or storehouse_address like ? "
-		if len(slicekey) > 0 {
-			for i := 0; i < len(slicekey); i++ {
-				adminid = adminid + " or storehouse_admin_id =" + strconv.FormatInt(slicekey[i], 10)
-			}
-		}
-		keyword = "%" + keyword + "%"
-		db = db.Where(adminid, keyword, keyword, keyword)
-	}
-	err = db.Count(&total).Offset(offset).Order("id").Limit(limit).Find(&storehouse).Error
-	return storehouse, total, err
-}
-
-//获取当前机构所有可用的仓库名字
-func GetAllStorehouseName(orgid int64) (storehouse []models.Storehouse, err error) {
-	err = XTReadDB().Model(&models.Storehouse{}).Where("storehouse_status = 1 and status = 1 and user_org_id = ?", orgid).Find(&storehouse).Error
-	return
-}
-
-//根据机构id,生成一个默认仓库
-func GetDefaultStorehouse(orgid int64) error {
-	var code string
-	for a := true; a == true; {
-		code = CreateCode()
-		tmp := FindStorehouseCode(orgid, code)
-		//如果没有重复的编码结束循环
-		if tmp == false {
-			a = false
-		}
-	}
-	createid, err := Getcreateid(orgid)
-	if err != nil {
-		return err
-	}
-	storehouse := models.Storehouse{
-		StorehouseCode:    code,
-		StorehouseName:    "默认仓库",
-		StorehouseAddress: "",
-		StorehouseStatus:  1,
-		UserOrgId:         orgid,
-		StorehouseAdminId: createid.Creator,
-		Status:            1,
-		Ctime:             time.Now().Unix(),
-	}
-	err = AddStroehouse(storehouse)
-	return err
-}
-
-//查找该机构id是否有仓库存在,ture存在，false不存在
-func IsStorehouse(orgid int64) bool {
-	var total int
-	XTReadDB().Model(&models.Storehouse{}).Where("user_org_id = ?", orgid).Count(&total)
-	if total > 0 {
-		return true
-	} else {
-		return false
-	}
-}
-
-//查找该机构id是否有仓库配置存在,ture存在，false不存在
-func IsStorehouseconfigXT(orgid int64, tx *gorm.DB) bool {
-	var total int
-	tx.Model(&models.StorehouseConfig{}).Where("user_org_id = ? and status = 1", orgid).Count(&total)
-	if total > 0 {
-		return true
-	} else {
-		return false
-	}
-}
-
-//  根据机构id查询仓库配置
-//storehouse_info:耗材 自动入库 的仓库id
-//storehouse_out_info:耗材 自动出库 的仓库id
-//drug_storehouse_info:药品 自动入库 的仓库id
-//drug_storehouse_out:药品 自动出库 的仓库id
-func FindStorehouseConfig(orgid int64) (storehouse_config models.StorehouseConfig, err error) {
-	err = XTReadDB().Model(&models.StorehouseConfig{}).Where("status = 1 and user_org_id = ?", orgid).Find(&storehouse_config).Error
-	return
-}
-
-//根据机构id,仓库id新建一个仓库配置
-func CreateStorehouseConfig(orgid, id int64) (err error) {
-	storeconfig := models.StorehouseConfig{
-		UserOrgId:          orgid,
-		StorehouseInfo:     id,
-		StorehouseOutInfo:  id,
-		DrugStorehouseInfo: id,
-		DrugStorehouseOut:  id,
-		Status:             1,
-		Ctime:              time.Now().Unix(),
-	}
-	err = XTWriteDB().Create(&storeconfig).Error
-	return
-}
-
-//根据机构id,仓库id新建一个仓库配置,带事务
-func CreateStorehouseConfigXT(orgid, id int64, tx *gorm.DB) (err error) {
-	storeconfig := models.StorehouseConfig{
-		UserOrgId:          orgid,
-		StorehouseInfo:     id,
-		StorehouseOutInfo:  id,
-		DrugStorehouseInfo: id,
-		DrugStorehouseOut:  id,
-		Status:             1,
-		Ctime:              time.Now().Unix(),
-	}
-	err = tx.Create(&storeconfig).Error
-	return
-}
-
-//更改耗材自动入库仓库
-func UpdateInfo(orgid, id int64) (err error) {
-	mtime := time.Now().Unix()
-	err = XTWriteDB().Model(&models.StorehouseConfig{}).Where("user_org_id = ? and status = 1", orgid).Updates(map[string]interface{}{"storehouse_info": id, "mtime": mtime}).Error
-	return
-}
-
-//更改耗材自动出库仓库
-func UpdateOutInfo(orgid, id int64) (err error) {
-	mtime := time.Now().Unix()
-	err = XTWriteDB().Model(&models.StorehouseConfig{}).Where("user_org_id = ? and status = 1", orgid).Updates(map[string]interface{}{"storehouse_out_info": id, "mtime": mtime}).Error
-	return
-}
-
-//更改药品自动入库仓库
-func UpdateDrugInfo2(orgid, id int64) (err error) {
-	mtime := time.Now().Unix()
-	err = XTWriteDB().Model(&models.StorehouseConfig{}).Where("user_org_id = ? and status = 1", orgid).Updates(map[string]interface{}{"drug_storehouse_info": id, "mtime": mtime}).Error
-	return
-}
-
-//更改药品自动出库仓库
-func UpdateDrugOut(orgid, id int64) (err error) {
-	mtime := time.Now().Unix()
-	err = XTWriteDB().Model(&models.StorehouseConfig{}).Where("user_org_id = ? and status = 1", orgid).Updates(map[string]interface{}{"drug_storehouse_out": id, "mtime": mtime}).Error
-	return
-}
-
-//根据id查询仓库名称
-func FindStorehouseName(id int64) (storehouse models.Storehouse, err error) {
-	err = XTReadDB().Model(&models.Storehouse{}).Where("id = ?", id).Find(&storehouse).Error
-	return
-}
-
-//判断该仓库是否在仓库配置表中
-func IsInConfig(orgid, id int64) bool {
-	var total int
-	XTReadDB().Model(&models.StorehouseConfig{}).Where("user_org_id = ? and status = 1", orgid).Where(
-		"storehouse_info = ? or storehouse_out_info = ? or drug_storehouse_info = ? or drug_storehouse_out = ?", id, id, id, id).Count(&total)
-	if total > 0 {
-		return true //存在
-	} else {
-		return false
-	}
-}
-
-//兼容旧数据
-func Byliinit() (err error) {
-	tx := XTWriteDB().Begin()
-	defer func() {
-		if err != nil && err.Error() != "record not found" {
-			tx.Rollback()
-		} else {
-			tx.Commit()
-		}
-	}()
-	err = initsgj_user_admin(tx)
-	if err != nil && err.Error() != "record not found" {
-		return
-	}
-	err = StoreReduceOrg(tx)
-	if err != nil && err.Error() != "record not found" {
-		return
-	}
-	err = StoreReduceConfig(tx)
-	if err != nil && err.Error() != "record not found" {
-		return
-	}
-	err = initxt_storehouse(tx)
-	if err != nil && err.Error() != "record not found" {
-		return
-	}
-	err = initxt_stock_flow(tx)
-	if err != nil && err.Error() != "record not found" {
-		return
-	}
-	err = initxt_drug_flow(tx)
-	if err != nil && err.Error() != "record not found" {
-		return
-	}
-	err = initdialysis_before_prepare(tx)
-	if err != nil && err.Error() != "record not found" {
-		return
-	}
-	err = initxt_automatic_reduce_detail(tx)
-	if err != nil && err.Error() != "record not found" {
-		return
-	}
-	err = initxt_drug_automatic_reduce_detail(tx)
-	if err != nil && err.Error() != "record not found" {
-		return
-	}
-	err = initxt_warehouse(tx)
-	if err != nil && err.Error() != "record not found" {
-		return
-	}
-	err = initxt_warehouse_info(tx)
-	if err != nil && err.Error() != "record not found" {
-		return
-	}
-	err = initxt_warehouse_out(tx)
-	if err != nil && err.Error() != "record not found" {
-		return
-	}
-	err = initxt_warehouse_out_info(tx)
-	if err != nil && err.Error() != "record not found" {
-		return
-	}
-	err = initxt_drug_warehouse(tx)
-	if err != nil && err.Error() != "record not found" {
-		return
-	}
-	err = initxt_drug_warehouse_info(tx)
-	if err != nil && err.Error() != "record not found" {
-		return
-	}
-	err = initxt_drug_warehouse_out(tx)
-	if err != nil && err.Error() != "record not found" {
-		return
-	}
-	err = initxt_drug_warehouse_out_info(tx)
-	if err != nil && err.Error() != "record not found" {
-		return
-	}
-	err = initxt_cancel_stock(tx)
-	if err != nil && err.Error() != "record not found" {
-		return
-	}
-	err = initxt_cancel_stock_info(tx)
-	if err != nil && err.Error() != "record not found" {
-		return
-	}
-	err = initxt_drug_cancel_stock(tx)
-	if err != nil && err.Error() != "record not found" {
-		return
-	}
-	err = initxt_drug_cancel_stock_info(tx)
-	if err != nil && err.Error() != "record not found" {
-		return
-	}
-	err = initxt_supplier_warehouse_info(tx)
-	if err != nil && err.Error() != "record not found" {
-		return
-	}
-	err = initxt_supplier_warehousing_info_order(tx)
-	if err != nil && err.Error() != "record not found" {
-		return
-	}
-	err = initxt_supplier_warehouse_out(tx)
-	if err != nil && err.Error() != "record not found" {
-		return
-	}
-	err = initxt_supplier_warehousing_out_order(tx)
-	if err != nil && err.Error() != "record not found" {
-		return
-	}
-	err = initxt_supplier_warehouse_cancel(tx)
-	if err != nil && err.Error() != "record not found" {
-		return
-	}
-	err = initxt_supplier_warehousing_cancel_order(tx)
-
-	return
-}
-
-//初始化管理员名字
-func initsgj_user_admin(tx *gorm.DB) (err error) {
-	err = tx.Exec("update sgj_users.sgj_user_admin set name = \"超级管理员\" where name is null or name = \"\"").Error
-	return
-}
-
-//根据xt_gobal_template 获取的机构id减去仓库表存在的机构id，把结果插入到仓库表
-func StoreReduceOrg(tx *gorm.DB) (err error) {
-	err = tx.Exec("INSERT INTO sgj_xt.xt_storehouse(storehouse_code,storehouse_name,user_org_id,ctime)" +
-		"SELECT CONCAT(\"SH-\",FLOOR(RAND()*9000+1000)),\"默认仓库\",tmp.id,UNIX_TIMESTAMP()" +
-		"FROM" +
-		"(select t1.org_id as id FROM sgj_xt.xt_gobal_template as t1 LEFT JOIN " +
-		"(SELECT distinct user_org_id as i FROM sgj_xt.xt_storehouse) as t2 on t1.org_id = t2.i WHERE t2.i is null and t1.status = 1)tmp").Error
-	//err = tx.Exec("INSERT INTO sgj_xt.xt_storehouse(storehouse_code,storehouse_name,user_org_id,ctime)" +
-	//	"SELECT CONCAT(\"sh-\",FLOOR(RAND()*9000+1000)),\"默认仓库\",tmp.id,UNIX_TIMESTAMP()" +
-	//	"FROM" +
-	//	"(select t1.id FROM sgj_users.sgj_user_org as t1 LEFT JOIN " +
-	//	"(SELECT distinct user_org_id as i FROM sgj_xt.xt_storehouse) as t2 on t1.id = t2.i WHERE t2.i is null and t1.status != 0 and t1.import = 0)tmp").Error
-	return
-}
-
-//查找仓库表的orgid 减去仓库配置表的orgid，把结果插入到仓库配置表
-func StoreReduceConfig(tx *gorm.DB) (err error) {
-	err = tx.Exec("INSERT INTO sgj_xt.xt_storehouse_config(user_org_id,storehouse_info,storehouse_out_info,drug_storehouse_info,drug_storehouse_out,ctime)" +
-		"SELECT tmp.user_org_id,tmp.id,tmp.id,tmp.id,tmp.id,UNIX_TIMESTAMP()" +
-		"FROM(select t1.id,t1.user_org_id FROM sgj_xt.xt_storehouse as t1 LEFT JOIN " +
-		"(SELECT user_org_id as i FROM sgj_xt.xt_storehouse_config) as t2 on t1.user_org_id = t2.i WHERE t2.i is null and t1.status = 1)tmp").Error
-	return
-}
-
-//初始化 xt_storehouse 管理员的名字
-func initxt_storehouse(tx *gorm.DB) (err error) {
-	err = tx.Exec("UPDATE sgj_xt.xt_storehouse as t," +
-		"(SELECT o.id,o.creator from sgj_users.sgj_user_org as o," +
-		"(SELECT DISTINCT org_id from sgj_xt.xt_gobal_template)as t " +
-		"WHERE t.org_id = o.id )tmp " +
-		"SET t.storehouse_admin_id = tmp.creator,t.mtime = UNIX_TIMESTAMP()" +
-		"WHERE t.status = 1 and t.user_org_id = tmp.id").Error
-	return
-}
-
-//初始化 xt_stock_flow（完成）
-func initxt_stock_flow(tx *gorm.DB) (err error) {
-	err = tx.Exec("UPDATE sgj_xt.xt_stock_flow as t," +
-		"(SELECT t1.user_org_id as orgid,t1.storehouse_info as id from sgj_xt.xt_storehouse_config as t1," +
-		"(SELECT distinct user_org_id as orgid FROM sgj_xt.xt_stock_flow  WHERE storehouse_id is NULL or storehouse_id = 0 )t2 " +
-		"WHERE t1.user_org_id = t2.orgid)tmp " +
-		"SET t.storehouse_id = tmp.id,t.mtime = UNIX_TIMESTAMP()" +
-		"WHERE (t.storehouse_id = 0 or t.storehouse_id is null) and t.user_org_id = tmp.orgid").Error
-	return
-}
-
-//初始化 xt_drug_flow（完成）
-func initxt_drug_flow(tx *gorm.DB) (err error) {
-	err = tx.Exec("UPDATE sgj_xt.xt_drug_flow as t," +
-		"(SELECT t1.user_org_id as orgid,t1.storehouse_info as id from sgj_xt.xt_storehouse_config as t1," +
-		"(SELECT distinct user_org_id as orgid FROM sgj_xt.xt_drug_flow  WHERE storehouse_id is NULL or storehouse_id = 0 )t2 " +
-		"WHERE t1.user_org_id = t2.orgid)tmp " +
-		"SET t.storehouse_id = tmp.id,t.mtime = UNIX_TIMESTAMP()" +
-		"WHERE (t.storehouse_id = 0 or t.storehouse_id is null) and t.user_org_id = tmp.orgid").Error
-	return
-}
-
-//初始化 dialysis_before_prepare（完成）
-func initdialysis_before_prepare(tx *gorm.DB) (err error) {
-	err = tx.Exec("UPDATE sgj_xt.dialysis_before_prepare as t," +
-		"(SELECT t1.user_org_id as orgid,t1.storehouse_info as id from sgj_xt.xt_storehouse_config as t1," +
-		"(SELECT distinct user_org_id as orgid FROM sgj_xt.dialysis_before_prepare  WHERE storehouse_id is NULL or storehouse_id = 0 )t2 " +
-		"WHERE t1.user_org_id = t2.orgid)tmp " +
-		"SET t.storehouse_id = tmp.id,t.mtime = UNIX_TIMESTAMP()" +
-		"WHERE (t.storehouse_id = 0 or t.storehouse_id is null) and t.user_org_id = tmp.orgid").Error
-	return
-}
 
-//初始化 xt_automatic_reduce_detail（完成）
-func initxt_automatic_reduce_detail(tx *gorm.DB) (err error) {
-	err = tx.Exec("UPDATE sgj_xt.xt_automatic_reduce_detail as t," +
-		"(SELECT t1.user_org_id as orgid,t1.storehouse_out_info as id from sgj_xt.xt_storehouse_config as t1," +
-		"(SELECT distinct org_id as orgid FROM sgj_xt.xt_automatic_reduce_detail  WHERE storehouse_id is NULL or storehouse_id = 0 )t2 " +
-		"WHERE t1.user_org_id = t2.orgid)tmp " +
-		"SET t.storehouse_id = tmp.id,t.mtime = UNIX_TIMESTAMP()" +
-		"WHERE (t.storehouse_id = 0 or t.storehouse_id is null) and t.org_id = tmp.orgid").Error
-	return
-}
-
-//初始化 xt_drug_automatic_reduce_detail（完成）
-func initxt_drug_automatic_reduce_detail(tx *gorm.DB) (err error) {
-	err = tx.Exec("UPDATE sgj_xt.xt_drug_automatic_reduce_detail as t," +
-		"(SELECT t1.user_org_id as orgid,t1.drug_storehouse_out as id from sgj_xt.xt_storehouse_config as t1," +
-		"(SELECT distinct org_id as orgid FROM sgj_xt.xt_drug_automatic_reduce_detail  WHERE storehouse_id is NULL or storehouse_id = 0 )t2 " +
-		"WHERE t1.user_org_id = t2.orgid)tmp " +
-		"SET t.storehouse_id = tmp.id,t.mtime = UNIX_TIMESTAMP()" +
-		"WHERE (t.storehouse_id = 0 or t.storehouse_id is null) and t.org_id = tmp.orgid").Error
-	return
-}
-
-//初始化 xt_warehouse（完成）
-func initxt_warehouse(tx *gorm.DB) (err error) {
-	err = tx.Exec("UPDATE sgj_xt.xt_warehouse as t," +
-		"(SELECT t1.user_org_id as orgid,t1.storehouse_info as id from sgj_xt.xt_storehouse_config as t1," +
-		"(SELECT distinct org_id as orgid FROM sgj_xt.xt_warehouse  WHERE storehouse_id is NULL or storehouse_id = 0 )t2 " +
-		"WHERE t1.user_org_id = t2.orgid)tmp " +
-		"SET t.storehouse_id = tmp.id,t.mtime = UNIX_TIMESTAMP()" +
-		"WHERE (t.storehouse_id = 0 or t.storehouse_id is null) and t.org_id = tmp.orgid").Error
-	return
-}
-
-//初始化 xt_warehouse_info（完成）
-func initxt_warehouse_info(tx *gorm.DB) (err error) {
-	err = tx.Exec("UPDATE sgj_xt.xt_warehouse_info as t," +
-		"(SELECT t1.user_org_id as orgid,t1.storehouse_info as id from sgj_xt.xt_storehouse_config as t1," +
-		"(SELECT distinct org_id as orgid FROM sgj_xt.xt_warehouse_info  WHERE storehouse_id is NULL or storehouse_id = 0 )t2 " +
-		"WHERE t1.user_org_id = t2.orgid)tmp " +
-		"SET t.storehouse_id = tmp.id,t.mtime = UNIX_TIMESTAMP()" +
-		"WHERE (t.storehouse_id = 0 or t.storehouse_id is null) and t.org_id = tmp.orgid").Error
-	return
-}
-
-//初始化 xt_warehouse_out（完成）
-func initxt_warehouse_out(tx *gorm.DB) (err error) {
-	err = tx.Exec("UPDATE sgj_xt.xt_warehouse_out as t," +
-		"(SELECT t1.user_org_id as orgid,t1.storehouse_out_info as id from sgj_xt.xt_storehouse_config as t1," +
-		"(SELECT distinct org_id as orgid FROM sgj_xt.xt_warehouse_out  WHERE storehouse_id is NULL or storehouse_id = 0 )t2 " +
-		"WHERE t1.user_org_id = t2.orgid)tmp " +
-		"SET t.storehouse_id = tmp.id,t.mtime = UNIX_TIMESTAMP()" +
-		"WHERE (t.storehouse_id = 0 or t.storehouse_id is null) and t.org_id = tmp.orgid").Error
-	return
-}
-
-//初始化 xt_warehouse_out_info（完成）
-func initxt_warehouse_out_info(tx *gorm.DB) (err error) {
-	err = tx.Exec("UPDATE sgj_xt.xt_warehouse_out_info as t," +
-		"(SELECT t1.user_org_id as orgid,t1.storehouse_out_info as id from sgj_xt.xt_storehouse_config as t1," +
-		"(SELECT distinct org_id as orgid FROM sgj_xt.xt_warehouse_out_info  WHERE storehouse_id is NULL or storehouse_id = 0 )t2 " +
-		"WHERE t1.user_org_id = t2.orgid)tmp " +
-		"SET t.storehouse_id = tmp.id,t.mtime = UNIX_TIMESTAMP()" +
-		"WHERE (t.storehouse_id = 0 or t.storehouse_id is null) and t.org_id = tmp.orgid").Error
-	return
-}
-
-//初始化 xt_drug_warehouse（完成）
-func initxt_drug_warehouse(tx *gorm.DB) (err error) {
-	err = tx.Exec("UPDATE sgj_xt.xt_drug_warehouse as t," +
-		"(SELECT t1.user_org_id as orgid,t1.drug_storehouse_info as id from sgj_xt.xt_storehouse_config as t1," +
-		"(SELECT distinct org_id as orgid FROM sgj_xt.xt_drug_warehouse  WHERE storehouse_id is NULL or storehouse_id = 0 )t2 " +
-		"WHERE t1.user_org_id = t2.orgid)tmp " +
-		"SET t.storehouse_id = tmp.id,t.mtime = UNIX_TIMESTAMP()" +
-		"WHERE (t.storehouse_id = 0 or t.storehouse_id is null) and t.org_id = tmp.orgid").Error
-	return
-}
-
-//初始化 xt_drug_warehouse_info（完成）
-func initxt_drug_warehouse_info(tx *gorm.DB) (err error) {
-	err = tx.Exec("UPDATE sgj_xt.xt_drug_warehouse_info as t," +
-		"(SELECT t1.user_org_id as orgid,t1.drug_storehouse_info as id from sgj_xt.xt_storehouse_config as t1," +
-		"(SELECT distinct org_id as orgid FROM sgj_xt.xt_drug_warehouse_info  WHERE storehouse_id is NULL or storehouse_id = 0 )t2 " +
-		"WHERE t1.user_org_id = t2.orgid)tmp " +
-		"SET t.storehouse_id = tmp.id,t.mtime = UNIX_TIMESTAMP()" +
-		"WHERE (t.storehouse_id = 0 or t.storehouse_id is null) and t.org_id = tmp.orgid").Error
-	return
-}
-
-//初始化 xt_drug_warehouse_out（完成）
-func initxt_drug_warehouse_out(tx *gorm.DB) (err error) {
-	err = tx.Exec("UPDATE sgj_xt.xt_drug_warehouse_out as t," +
-		"(SELECT t1.user_org_id as orgid,t1.drug_storehouse_out as id from sgj_xt.xt_storehouse_config as t1," +
-		"(SELECT distinct org_id as orgid FROM sgj_xt.xt_drug_warehouse_out  WHERE storehouse_id is NULL or storehouse_id = 0 )t2 " +
-		"WHERE t1.user_org_id = t2.orgid)tmp " +
-		"SET t.storehouse_id = tmp.id,t.mtime = UNIX_TIMESTAMP()" +
-		"WHERE (t.storehouse_id = 0 or t.storehouse_id is null) and t.org_id = tmp.orgid").Error
-	return
-}
-
-//初始化 xt_drug_warehouse_out_info（完成）
-func initxt_drug_warehouse_out_info(tx *gorm.DB) (err error) {
-	err = tx.Exec("UPDATE sgj_xt.xt_drug_warehouse_out_info as t," +
-		"(SELECT t1.user_org_id as orgid,t1.drug_storehouse_out as id from sgj_xt.xt_storehouse_config as t1," +
-		"(SELECT distinct org_id as orgid FROM sgj_xt.xt_drug_warehouse_out_info  WHERE storehouse_id is NULL or storehouse_id = 0 )t2 " +
-		"WHERE t1.user_org_id = t2.orgid)tmp " +
-		"SET t.storehouse_id = tmp.id,t.mtime = UNIX_TIMESTAMP()" +
-		"WHERE (t.storehouse_id = 0 or t.storehouse_id is null) and t.org_id = tmp.orgid").Error
-	return
-}
-
-//初始化 xt_cancel_stock（完成）
-func initxt_cancel_stock(tx *gorm.DB) (err error) {
-	err = tx.Exec("UPDATE sgj_xt.xt_cancel_stock as t," +
-		"(SELECT t1.user_org_id as orgid,t1.storehouse_out_info as id from sgj_xt.xt_storehouse_config as t1," +
-		"(SELECT distinct org_id as orgid FROM sgj_xt.xt_cancel_stock  WHERE storehouse_id is NULL or storehouse_id = 0 )t2 " +
-		"WHERE t1.user_org_id = t2.orgid)tmp " +
-		"SET t.storehouse_id = tmp.id,t.mtime = UNIX_TIMESTAMP()" +
-		"WHERE (t.storehouse_id = 0 or t.storehouse_id is null) and t.org_id = tmp.orgid").Error
-	return
-}
-
-//初始化 xt_cancel_stock_info（完成）
-func initxt_cancel_stock_info(tx *gorm.DB) (err error) {
-	err = tx.Exec("UPDATE sgj_xt.xt_cancel_stock_info as t," +
-		"(SELECT t1.user_org_id as orgid,t1.storehouse_out_info as id from sgj_xt.xt_storehouse_config as t1," +
-		"(SELECT distinct org_id as orgid FROM sgj_xt.xt_cancel_stock_info  WHERE storehouse_id is NULL or storehouse_id = 0 )t2 " +
-		"WHERE t1.user_org_id = t2.orgid)tmp " +
-		"SET t.storehouse_id = tmp.id,t.mtime = UNIX_TIMESTAMP()" +
-		"WHERE (t.storehouse_id = 0 or t.storehouse_id is null) and t.org_id = tmp.orgid").Error
-	return
-}
-
-//初始化 xt_drug_cancel_stock（完成）
-func initxt_drug_cancel_stock(tx *gorm.DB) (err error) {
-	err = tx.Exec("UPDATE sgj_xt.xt_drug_cancel_stock as t," +
-		"(SELECT t1.user_org_id as orgid,t1.drug_storehouse_out as id from sgj_xt.xt_storehouse_config as t1," +
-		"(SELECT distinct org_id as orgid FROM sgj_xt.xt_drug_cancel_stock  WHERE storehouse_id is NULL or storehouse_id = 0 )t2 " +
-		"WHERE t1.user_org_id = t2.orgid)tmp " +
-		"SET t.storehouse_id = tmp.id,t.mtime = UNIX_TIMESTAMP()" +
-		"WHERE (t.storehouse_id = 0 or t.storehouse_id is null) and t.org_id = tmp.orgid").Error
-	return
-}
-
-//初始化 xt_drug_cancel_stock_info（完成）
-func initxt_drug_cancel_stock_info(tx *gorm.DB) (err error) {
-	err = tx.Exec("UPDATE sgj_xt.xt_drug_cancel_stock_info as t," +
-		"(SELECT t1.user_org_id as orgid,t1.drug_storehouse_out as id from sgj_xt.xt_storehouse_config as t1," +
-		"(SELECT distinct org_id as orgid FROM sgj_xt.xt_drug_cancel_stock_info  WHERE storehouse_id is NULL or storehouse_id = 0 )t2 " +
-		"WHERE t1.user_org_id = t2.orgid)tmp " +
-		"SET t.storehouse_id = tmp.id,t.mtime = UNIX_TIMESTAMP()" +
-		"WHERE (t.storehouse_id = 0 or t.storehouse_id is null) and t.org_id = tmp.orgid").Error
-	return
-}
-
-//初始化 xt_supplier_warehouse_info（完成）
-func initxt_supplier_warehouse_info(tx *gorm.DB) (err error) {
-	err = tx.Exec("UPDATE sgj_xt.xt_supplier_warehouse_info as t," +
-		"(SELECT t1.user_org_id as orgid,t1.storehouse_info as id from sgj_xt.xt_storehouse_config as t1," +
-		"(SELECT distinct user_org_id as orgid FROM sgj_xt.xt_supplier_warehouse_info  WHERE storehouse_id is NULL or storehouse_id = 0 )t2 " +
-		"WHERE t1.user_org_id = t2.orgid)tmp " +
-		"SET t.storehouse_id = tmp.id,t.mtime = UNIX_TIMESTAMP()" +
-		"WHERE (t.storehouse_id = 0 or t.storehouse_id is null) and t.user_org_id = tmp.orgid").Error
-	return
-}
-
-//初始化 xt_supplier_warehousing_info_order（完成）
-func initxt_supplier_warehousing_info_order(tx *gorm.DB) (err error) {
-	err = tx.Exec("UPDATE sgj_xt.xt_supplier_warehousing_info_order as t," +
-		"(SELECT t1.user_org_id as orgid,t1.storehouse_info as id from sgj_xt.xt_storehouse_config as t1," +
-		"(SELECT distinct user_org_id as orgid FROM sgj_xt.xt_supplier_warehousing_info_order  WHERE storehouse_id is NULL or storehouse_id = 0 )t2 " +
-		"WHERE t1.user_org_id = t2.orgid)tmp " +
-		"SET t.storehouse_id = tmp.id,t.mtime = UNIX_TIMESTAMP()" +
-		"WHERE (t.storehouse_id = 0 or t.storehouse_id is null) and t.user_org_id = tmp.orgid").Error
-	return
-}
-
-//初始化 xt_supplier_warehouse_out（完成）
-func initxt_supplier_warehouse_out(tx *gorm.DB) (err error) {
-	err = tx.Exec("UPDATE sgj_xt.xt_supplier_warehouse_out as t," +
-		"(SELECT t1.user_org_id as orgid,t1.storehouse_out_info as id from sgj_xt.xt_storehouse_config as t1," +
-		"(SELECT distinct user_org_id as orgid FROM sgj_xt.xt_supplier_warehouse_out  WHERE storehouse_id is NULL or storehouse_id = 0 )t2 " +
-		"WHERE t1.user_org_id = t2.orgid)tmp " +
-		"SET t.storehouse_id = tmp.id,t.mtime = UNIX_TIMESTAMP()" +
-		"WHERE (t.storehouse_id = 0 or t.storehouse_id is null) and t.user_org_id = tmp.orgid").Error
-	return
-}
-
-//初始化 xt_supplier_warehousing_out_order（完成）
-func initxt_supplier_warehousing_out_order(tx *gorm.DB) (err error) {
-	err = tx.Exec("UPDATE sgj_xt.xt_supplier_warehousing_out_order as t," +
-		"(SELECT t1.user_org_id as orgid,t1.storehouse_info as id from sgj_xt.xt_storehouse_config as t1," +
-		"(SELECT distinct user_org_id as orgid FROM sgj_xt.xt_supplier_warehousing_out_order  WHERE storehouse_id is NULL or storehouse_id = 0 )t2 " +
-		"WHERE t1.user_org_id = t2.orgid)tmp " +
-		"SET t.storehouse_id = tmp.id,t.mtime = UNIX_TIMESTAMP()" +
-		"WHERE (t.storehouse_id = 0 or t.storehouse_id is null) and t.user_org_id = tmp.orgid").Error
-	return
-}
-
-//初始化 xt_supplier_warehouse_cancel（完成）
-func initxt_supplier_warehouse_cancel(tx *gorm.DB) (err error) {
-	err = tx.Exec("UPDATE sgj_xt.xt_supplier_warehouse_cancel as t," +
-		"(SELECT t1.user_org_id as orgid,t1.storehouse_info as id from sgj_xt.xt_storehouse_config as t1," +
-		"(SELECT distinct user_org_id as orgid FROM sgj_xt.xt_supplier_warehouse_cancel  WHERE storehouse_id is NULL or storehouse_id = 0 )t2 " +
-		"WHERE t1.user_org_id = t2.orgid)tmp " +
-		"SET t.storehouse_id = tmp.id,t.mtime = UNIX_TIMESTAMP()" +
-		"WHERE (t.storehouse_id = 0 or t.storehouse_id is null) and t.user_org_id = tmp.orgid").Error
-	return
-}
-
-//初始化 xt_supplier_warehousing_cancel_order（完成）
-func initxt_supplier_warehousing_cancel_order(tx *gorm.DB) (err error) {
-	err = tx.Exec("UPDATE sgj_xt.xt_supplier_warehousing_cancel_order as t," +
-		"(SELECT t1.user_org_id as orgid,t1.storehouse_info as id from sgj_xt.xt_storehouse_config as t1," +
-		"(SELECT distinct user_org_id as orgid FROM sgj_xt.xt_supplier_warehousing_cancel_order  WHERE storehouse_id is NULL or storehouse_id = 0 )t2 " +
-		"WHERE t1.user_org_id = t2.orgid)tmp " +
-		"SET t.storehouse_id = tmp.id,t.mtime = UNIX_TIMESTAMP()" +
-		"WHERE (t.storehouse_id = 0 or t.storehouse_id is null) and t.user_org_id = tmp.orgid").Error
-	return
-}
-
-//查询机构创建者的id
-func Getcreateid(orgid int64) (createid models.UserOrg, err error) {
-	err = XTReadDB().Select("id,creator").Where("id = ? and status = 1", orgid).Find(&createid).Error
-	return
-}
-
-//根据机构id查询拥有仓库管理权限的角色
-func FindRoles(orgid int64) map[string]int {
-	role := []models.RolePurviews{}
-	roles := make(map[string]int)
-	XTReadDB().Select("role_id").Where("purview_ids like \"%299%\" and org_id = ? and status = 1", orgid).Find(&role)
-	for i := 0; i < len(role); i++ {
-		roles[strconv.FormatInt(role[i].RoleId, 10)] = i
-	}
-	return roles
-}
-
-//判断两个切片中的元素是否有重复的，true有重复的元素，false无相同元素
-func IsIdentical(str1 []string, str2 []string) (t bool) {
-	t = false
-	if len(str1) == 0 || len(str2) == 0 {
-		return
-	}
-	map1, map2 := make(map[string]int), make(map[string]int)
-	for i := 0; i < len(str1); i++ {
-		map1[str1[i]] = i
-	}
-	for i := 0; i < len(str2); i++ {
-		map2[str2[i]] = i
-	}
-	for k, _ := range map1 {
-		if _, ok := map2[k]; ok {
-			t = true
-		}
-	}
-	return
 func ModifyWarehouseOut(id int64, orgid int64, good_id int64) error {
 	err := XTWriteDB().Model(&models.WarehouseOut{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"status": 0}).Error