耗材参数

conf/app.conf

@@ -1,5 +1,5 @@
 appname = 血透
-httpport = 9531
+httpport = 9529
 runmode = dev
 
 #

controllers/drug_stock_api_contorller.go

@@ -3049,8 +3049,8 @@ func (c *StockDrugApiController) GetDrugOutOrderPrint() {
 	adminUserInfo := c.GetAdminUserInfo()
 	orgId := adminUserInfo.CurrentOrgId
 	if order_type == 2 {
-		//list, err := service.GetDrugOutOrderPrint(startTime, endTime, orgId)
-		list, err := service.GetDrugOutOrderPrintList(startTime, endTime, orgId)
+		list, err := service.GetDrugOutOrderInfoPrintList(startTime, endTime, orgId)
+		//list, err := service.GetDrugOutOrderPrintList(startTime, endTime, orgId)
 		if err == nil {
 			c.ServeSuccessJSON(map[string]interface{}{
 				"list": list,

controllers/gobal_config_api_controller.go

@@ -2098,8 +2098,10 @@ func (c *GobalConfigApiController) GetDrugOutOrderPrint() {
 	ids := strings.Split(id, ",")
 	admin := c.GetAdminUserInfo()
 	info, _ := service.FindeDrugWarehouseOutOrder(ids, admin.CurrentOrgId)
+	//info, _ := service.GetExportOutOrderDrugListOne(ids)
 	manufacturerList, _ := service.GetAllManufacturerList(admin.CurrentOrgId)
-	warehousing, _ := service.FindeDrugWarehouseOutDetail(ids, admin.CurrentOrgId)
+	//warehousing, _ := service.FindeDrugWarehouseOutDetail(ids, admin.CurrentOrgId)
+	warehousing, _ := service.GetExportOutOrderDrugListOne(ids)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"info":             info,
 		"warehousing":      warehousing,
@@ -2137,7 +2139,8 @@ func (c *GobalConfigApiController) GetExportOutOrderDrugList() {
 	orderId := c.GetString("order_id")
 	ids := strings.Split(orderId, ",")
 	orgId := c.GetAdminUserInfo().CurrentOrgId
-	list, _ := service.GetExportOutOrderDrugList(ids)
+	//list, _ := service.GetExportOutOrderDrugList(ids)
+	list, _ := service.GetExportOutOrderDrugListOne(ids)
 	manufacturerList, _ := service.GetAllManufacturerList(orgId)
 	dealerList, _ := service.GetAllDealerList(orgId)
 	c.ServeSuccessJSON(map[string]interface{}{

controllers/print_data_api_controller.go

@@ -207,7 +207,8 @@ func (this *PrintDataAPIController) GetGoodDetailPrintList() {
 
 	//出库详情
 	if types == 2 {
-		list, err := service.GetWarehouseOutInfoGoodDetailPrintList(adminUserInfo.CurrentOrgId, startTime, endTime, limit, page)
+		//list, err := service.GetWarehouseOutInfoGoodDetailPrintList(adminUserInfo.CurrentOrgId, startTime, endTime, limit, page)
+		list, _ := service.GetWarehouseOutInfoPrintList(adminUserInfo.CurrentOrgId, startTime, endTime)
 		stockTotal, err := service.GetOutStockTotalCountTwo(startTime, endTime, adminUserInfo.CurrentOrgId)
 		if err != nil {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -219,4 +220,13 @@ func (this *PrintDataAPIController) GetGoodDetailPrintList() {
 		})
 	}
 
+	//退库详情
+	if types == 4 {
+
+		list, _ := service.GetWarehouseCancelPrintList(adminUserInfo.CurrentOrgId, startTime, endTime)
+		this.ServeSuccessJSON(map[string]interface{}{
+			"list": list,
+		})
+	}
+
 }

controllers/stock_in_api_controller.go

@@ -5297,7 +5297,9 @@ func (this *StockManagerApiController) SaveCheckDamage() {
 
 	if errcodes == gorm.ErrRecordNotFound {
 		service.AddSigleWarehouseOut(&warehouseOut)
+
 	}
+	out, _ := service.GetLastGoodWarehouseOut(adminUserInfo.CurrentOrgId)
 	manufacturerList, _ := service.GetAllManufacturerList(adminUserInfo.CurrentOrgId)
 	dealerList, _ := service.GetAllDealerList(adminUserInfo.CurrentOrgId)
 	var manufacturer_id int64
@@ -5314,10 +5316,11 @@ func (this *StockManagerApiController) SaveCheckDamage() {
 				dealer_id = its.ID
 			}
 		}
+		goodinfo, _ := service.GetGoodInformationByGoodId(item.GoodId)
 		//插入出库单
 		warehouseOutInfo := &models.WarehouseOutInfo{
-			WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
-			WarehouseOutId:          warehouseOut.ID,
+			WarehouseOutOrderNumber: out.WarehouseOutOrderNumber,
+			WarehouseOutId:          out.ID,
 			GoodId:                  item.GoodId,
 			Count:                   item.Count,
 			Price:                   item.PackingPrice,
@@ -5332,6 +5335,7 @@ func (this *StockManagerApiController) SaveCheckDamage() {
 			ProductDate:             item.ProductDate,
 			Dealer:                  dealer_id,
 			LicenseNumber:           item.LicenseNumber,
+			GoodTypeId:              goodinfo.GoodTypeId,
 		}
 		errOne := service.AddSigleWarehouseOutInfo(warehouseOutInfo)
 		fmt.Println("99999999999999", errOne)
@@ -5356,7 +5360,7 @@ func (this *StockManagerApiController) SaveCheckDamage() {
 			ConsumableType:          5,
 			IsSys:                   0,
 			WarehousingOrder:        "",
-			WarehouseOutId:          warehouseOutInfo.ID,
+			WarehouseOutId:          out.ID,
 			WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
 			IsEdit:                  0,
 			CancelStockId:           0,
@@ -5681,6 +5685,7 @@ func (this *StockManagerApiController) SaveCheckInventory() {
 
 		//查询该耗材最后1条批次
 		info, _ := service.GetLastWarehouseInfo(item.GoodId)
+		good, _ := service.GetGoodInformationByGoodId(item.GoodId)
 		fmt.Println("总共", item.Count)
 		fmt.Println("数据", list.StockCount)
 		//盘点盘点库存和et实际库存的大小
@@ -5729,6 +5734,7 @@ func (this *StockManagerApiController) SaveCheckInventory() {
 				Dealer:           dealer_id,
 				LicenseNumber:    info.LicenseNumber,
 				WarehouseInfoId:  item.WarehousingInfoId,
+				GoodTypeId:       good.GoodTypeId,
 			}
 
 			flow := models.VmStockFlow{
@@ -5785,9 +5791,10 @@ func (this *StockManagerApiController) SaveCheckInventory() {
 			}
 			err = service.CreateWarehouseOut(warehouseOut)
 			fmt.Println(err)
+			out, _ := service.GetLastGoodWarehouseOut(adminUserInfo.CurrentOrgId)
 			warehouseOutInfo := &models.WarehouseOutInfo{
-				WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
-				WarehouseOutId:          warehouseOut.ID,
+				WarehouseOutOrderNumber: out.WarehouseOutOrderNumber,
+				WarehouseOutId:          out.ID,
 				GoodId:                  warehouseInfo.GoodId,
 				Count:                   list.StockCount - item.Count,
 				Price:                   warehouseInfo.Price,
@@ -5802,6 +5809,7 @@ func (this *StockManagerApiController) SaveCheckInventory() {
 				ProductDate:             warehouseInfo.ProductDate,
 				Dealer:                  dealer_id,
 				LicenseNumber:           warehouseInfo.LicenseNumber,
+				GoodTypeId:              good.GoodTypeId,
 			}
 
 			stockFlow := models.VmStockFlow{
@@ -5816,7 +5824,7 @@ func (this *StockManagerApiController) SaveCheckInventory() {
 				ConsumableType:          2,
 				IsSys:                   2,
 				WarehousingOrder:        "",
-				WarehouseOutId:          warehouseOut.ID,
+				WarehouseOutId:          out.ID,
 				WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
 				IsEdit:                  1,
 				CancelStockId:           0,
@@ -5830,7 +5838,7 @@ func (this *StockManagerApiController) SaveCheckInventory() {
 				Mtime:                   0,
 				Price:                   warehouseInfo.Price,
 				WarehousingDetailId:     0,
-				WarehouseOutDetailId:    warehouseOutInfo.ID,
+				WarehouseOutDetailId:    out.ID,
 				CancelOutDetailId:       0,
 				ProductDate:             warehouseInfo.ProductDate,
 				ExpireDate:              warehouseInfo.ExpiryDate,

models/self_drug_models.go

@@ -843,3 +843,39 @@ type VmDrugInventory struct {
 	ProductDate       int64   `gorm:"column:product_date" json:"product_date" form:"product_date"`
 	DrugOriginPlace   string  `gorm:"column:drug_origin_place" json:"drug_origin_place" form:"drug_origin_place"`
 }
+
+type SgjDrugWarehouseOutInfo struct {
+	ID                      int64      `gorm:"column:id" json:"id" form:"id"`
+	WarehouseOutId          int64      `gorm:"column:warehouse_out_id" json:"warehouse_out_id" form:"warehouse_out_id"`
+	DrugId                  int64      `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	WarehousingOutTarget    int64      `gorm:"column:warehousing_out_target" json:"warehousing_out_target" form:"warehousing_out_target"`
+	Count                   int64      `gorm:"column:count" json:"count" form:"count"`
+	CountUnit               string     `gorm:"column:count_unit" json:"count_unit" form:"count_unit"`
+	Price                   float64    `gorm:"column:price" json:"price" form:"price"`
+	TotalPrice              float64    `gorm:"column:total_price" json:"total_price" form:"total_price"`
+	ProductDate             int64      `gorm:"column:product_date" json:"product_date" form:"product_date"`
+	ExpiryDate              int64      `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
+	Mtime                   int64      `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Ctime                   int64      `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Status                  int64      `gorm:"column:status" json:"status" form:"status"`
+	OrgId                   int64      `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	Remark                  string     `gorm:"column:remark" json:"remark" form:"remark"`
+	IsCancel                int64      `gorm:"column:is_cancel" json:"is_cancel" form:"is_cancel"`
+	WarehouseOutOrderNumber string     `gorm:"column:warehouse_out_order_number" json:"warehouse_out_order_number" form:"warehouse_out_order_number"`
+	Type                    int64      `gorm:"column:type" json:"type" form:"type"`
+	Dealer                  int64      `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Manufacturer            int64      `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	IsSys                   int64      `gorm:"column:is_sys" json:"is_sys" form:"is_sys"`
+	SysRecordTime           int64      `gorm:"column:sys_record_time" json:"sys_record_time" form:"sys_record_time"`
+	RetailPrice             float64    `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	RetailTotalPrice        float64    `gorm:"column:retail_total_price" json:"retail_total_price" form:"retail_total_price"`
+	WarehouseInfoId         int64      `gorm:"column:warehouse_info_id" json:"warehouse_info_id" form:"warehouse_info_id"`
+	Number                  string     `gorm:"column:number" json:"number" form:"number"`
+	BatchNumber             string     `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	PatientId               int64      `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	XtBaseDrug              XtBaseDrug `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId" `
+}
+
+func (SgjDrugWarehouseOutInfo) TableName() string {
+	return "xt_drug_warehouse_out_info"
+}

models/stock_models.go

@@ -1040,3 +1040,67 @@ type XtStockCorrectRecord struct {
 func (XtStockCorrectRecord) TableName() string {
 	return "xt_stock_correct_record"
 }
+
+type SgjWarehouseOutInfo struct {
+	ID                      int64   `gorm:"column:id" json:"id" form:"id"`
+	WarehouseOutId          int64   `gorm:"column:warehouse_out_id" json:"warehouse_out_id" form:"warehouse_out_id"`
+	WarehouseInfoId         int64   `gorm:"column:warehouse_info_id" json:"warehouse_info_id" form:"warehouse_info_id"`
+	GoodId                  int64   `gorm:"column:good_id" json:"good_id" form:"good_id"`
+	GoodTypeId              int64   `gorm:"column:good_type_id" json:"good_type_id" form:"good_type_id"`
+	WarehousingOutTarget    int64   `gorm:"column:warehousing_out_target" json:"warehousing_out_target" form:"warehousing_out_target"`
+	Count                   int64   `gorm:"column:count" json:"count" form:"count"`
+	Price                   float64 `gorm:"column:price" json:"price" form:"price"`
+	TotalPrice              float64 `gorm:"column:total_price" json:"total_price" form:"total_price"`
+	ProductDate             int64   `gorm:"column:product_date" json:"product_date" form:"product_date"`
+	ExpiryDate              int64   `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
+	Mtime                   int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Ctime                   int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Status                  int64   `gorm:"column:status" json:"status" form:"status"`
+	OrgId                   int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	Remark                  string  `gorm:"column:remark" json:"remark" form:"remark"`
+	IsCancel                int64   `gorm:"column:is_cancel" json:"is_cancel" form:"is_cancel"`
+	WarehouseOutOrderNumber string  `gorm:"column:warehouse_out_order_number" json:"warehouse_out_order_number" form:"warehouse_out_order_number"`
+	Type                    int64   `gorm:"column:type" json:"type" form:"type"`
+	Dealer                  int64   `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Manufacturer            int64   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	IsSys                   int64   `gorm:"column:is_sys" json:"is_sys" form:"is_sys"`
+	SysRecordTime           int64   `gorm:"column:sys_record_time" json:"sys_record_time" form:"sys_record_time"`
+	PatientId               int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Number                  string  `gorm:"column:number" json:"number" form:"number"`
+	LicenseNumber           string  `gorm:"column:license_number" json:"license_number" form:"license_number"`
+	ConsumableType          int64   `gorm:"column:consumable_type" json:"consumable_type" form:"consumable_type"`
+	GoodName                string  `gorm:"column:good_name" json:"good_name"`
+	SpecificationName       string  `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
+	PackingUnit             string  `gorm:"column:packing_unit" json:"packing_unit" form:"packing_unit"`
+	RetailPrice             float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	PackingPrice            float64 `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
+}
+
+type SgjCancelStockInfo struct {
+	ID                int64   `gorm:"column:id" json:"id" form:"id"`
+	GoodId            int64   `gorm:"column:good_id" json:"good_id" form:"good_id"`
+	CancelStockId     int64   `gorm:"column:cancel_stock_id" json:"cancel_stock_id" form:"cancel_stock_id"`
+	GoodTypeId        int64   `gorm:"column:good_type_id" json:"good_type_id" form:"good_type_id"`
+	Count             int64   `gorm:"column:count" json:"count" form:"count"`
+	Price             float64 `gorm:"column:price" json:"price" form:"price"`
+	Total             float64 `gorm:"column:total" json:"total" form:"total"`
+	ProductDate       int64   `gorm:"column:product_date" json:"product_date" form:"product_date"`
+	ExpiryDate        int64   `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
+	Ctime             int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime             int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status            int64   `gorm:"column:status" json:"status" form:"status"`
+	OrgId             int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	OrderNumber       string  `gorm:"column:order_number" json:"order_number" form:"order_number"`
+	Type              int64   `gorm:"column:type" json:"type" form:"type"`
+	Dealer            string  `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Manufacturer      string  `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	Number            string  `gorm:"column:number" json:"number" form:"number"`
+	RegisterAccount   string  `gorm:"column:register_account" json:"register_account" form:"register_account"`
+	Remark            string  `gorm:"column:remark" json:"remark" form:"remark"`
+	WarehouseInfoId   int64   `gorm:"column:warehouse_info_id" json:"warehouse_info_id" form:"warehouse_info_id"`
+	GoodName          string  `gorm:"column:good_name" json:"good_name"`
+	SpecificationName string  `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
+	PackingUnit       string  `gorm:"column:packing_unit" json:"packing_unit" form:"packing_unit"`
+	RetailPrice       float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	PackingPrice      float64 `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
+}

routers/router.go

@@ -11,7 +11,7 @@ import (
 func init() {
 	beego.InsertFilter("*", beego.BeforeRouter, cors.Allow(&cors.Options{
 		// AllowAllOrigins:  true,
-		AllowOrigins: []string{"https://xt.kuyicloud.com", "http://localhost:9528", "http://localhost:9529", "http://localhost:9531", "http://xt.test.shengws.com", "http://new_mobile.test.sgjyun.com", "https://xt.test.shengws.com", "http://xt.test.sgjyun.com", "https://xt.test.sgjyun.com", "http://localhost:8081", "http://localhost:8082", "https://pad.kuyicloud.com", "http://pad.kuyicloud.com", "http://pad.test.sgjyun.com", "https://pad.test.sgjyun.com", "http://admin.xt.test.sgjyun.com", "http://admin.xt.kuyicloud.com", "http://mobile.sgjyun.com", "http://mobile.kuyicloud.com"},
+		AllowOrigins: []string{"https://xt.kuyicloud.com", "https://xt.kuyicloud.com", "http://localhost:9528", "http://localhost:9529", "http://localhost:9531", "http://xt.test.shengws.com", "http://new_mobile.test.sgjyun.com", "https://xt.test.shengws.com", "http://xt.test.sgjyun.com", "https://xt.test.sgjyun.com", "http://localhost:8081", "http://localhost:8082", "https://pad.kuyicloud.com", "http://pad.kuyicloud.com", "http://pad.test.sgjyun.com", "https://pad.test.sgjyun.com", "http://admin.xt.test.sgjyun.com", "http://admin.xt.kuyicloud.com", "http://mobile.sgjyun.com", "http://mobile.kuyicloud.com"},
 		//AllowOrigins:     []string{"https://xt.kuyicloud.com", "http://localhost:9528", "http://xt.test.shengws.com","https://xt.test.shengws.com", "http://xt.test.sgjyun.com","https://xt.test.sgjyun.com", "http://localhost:8081", "http://localhost:8082", "https://pad.kuyicloud.com", "http://pad.kuyicloud.com", "http://pad.test.sgjyun.com","https://pad.test.sgjyun.com", "http://admin.xt.test.sgjyun.com", "http://admin.xt.kuyicloud.com","http://mobile.sgjyun.com","http://mobile.kuyicloud.com"},
 		AllowMethods:     []string{"GET", "POST", "PUT", "DELETE", "OPTIONS"},
 		AllowHeaders:     []string{"Origin", "Authorization", "Access-Control-Allow-Origin", "Access-Control-Allow-Headers", "Content-Type", "X-XSRF-TOKEN", "Permission"},

service/drug_stock_service.go

@@ -260,3 +260,19 @@ func GetDrugOutOrderPrintList(startime int64, endtime int64, orgid int64) (list
 	err = db.Preload("XtBaseDrug", "status = 1 and org_id = ?", orgid).Find(&list).Error
 	return list, err
 }
+
+func GetDrugOutOrderInfoPrintList(startime int64, endtime int64, orgid int64) (list []*models.SgjDrugWarehouseOutInfo, err error) {
+
+	db := XTReadDB().Table("xt_drug_warehouse_out_info").Where("status = 1")
+	if startime > 0 {
+		db = db.Where("ctime >=?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("ctime<=?", endtime)
+	}
+	if orgid > 0 {
+		db = db.Where("org_id = ?", orgid)
+	}
+	err = db.Preload("XtBaseDrug", "status = 1 and org_id = ?", orgid).Find(&list).Error
+	return list, err
+}

service/print_data_service/schedule_dialysis/print_schedule_dialysis_service.go

@@ -253,3 +253,39 @@ func GetWarehouseOutInfoGoodDetailPrintList(orgid int64, startime int64, endtime
 	return auto, err
 
 }
+
+func GetWarehouseOutInfoPrintList(orgid int64, startime int64, endtime int64) (out []*models.SgjWarehouseOutInfo, err error) {
+
+	db := p_service.XTReadDB().Table("xt_warehouse_out_info as x").Where("x.status = 1")
+	table := p_service.XTReadDB().Table("xt_good_information as t").Where("t.status = 1")
+	fmt.Println(table)
+	if orgid > 0 {
+		db = db.Where("x.org_id = ?", orgid)
+	}
+	if startime > 0 {
+		db = db.Where("x.ctime >= ?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("x.ctime<=?", endtime)
+	}
+	err = db.Select("x.patient_id,x.sys_record_time,x.good_id,sum(x.count) as count,t.good_name,t.specification_name,t.packing_unit,t.retail_price,t.packing_price").Joins("left join xt_good_information as t on t.id = x.good_id").Group("x.good_id").Scan(&out).Error
+	return out, err
+}
+
+func GetWarehouseCancelPrintList(orgid int64, startime int64, endtime int64) (cancel []*models.SgjCancelStockInfo, err error) {
+
+	db := p_service.XTReadDB().Table("xt_cancel_stock_info as x").Where("x.status = 1")
+	table := p_service.XTReadDB().Table("xt_good_information as t").Where("t.status = 1")
+	fmt.Println(table)
+	if orgid > 0 {
+		db = db.Where("x.org_id = ?", orgid)
+	}
+	if startime > 0 {
+		db = db.Where("x.ctime >= ?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("x.ctime<=?", endtime)
+	}
+	err = db.Select("x.ctime,x.good_id,sum(x.count) as count,t.good_name,t.specification_name,t.packing_unit,t.retail_price,t.packing_price").Joins("left join xt_good_information as t on t.id = x.good_id").Group("x.good_id").Scan(&cancel).Error
+	return cancel, err
+}

service/stock_service.go

@@ -3922,6 +3922,17 @@ func GetExportOutOrderDrugList(warehouse_out_id []string) (out []*models.StDrugW
 	return out, err
 }
 
+func GetExportOutOrderDrugListOne(warehouse_out_id []string) (out []*models.StDrugWarehouseOutInfo, err error) {
+	db := XTReadDB().Table("xt_drug_flow as x").Where("x.status = 1")
+	table := XTReadDB().Table("xt_base_drug as b").Where("b.status = 1")
+	fmt.Println("table", table)
+	if len(warehouse_out_id) > 0 {
+		db = db.Where("x.warehouse_out_id in(?)", warehouse_out_id)
+	}
+	err = db.Select("x.id,x.warehouse_out_id,x.drug_id,x.count,x.max_unit as count_unit,x.price,x.product_date,x.expire_date as expire_date,x.warehouse_out_order_number,x.dealer,x.manufacturer,x.is_sys,x.number,x.batch_number,x.patient_id,b.dose,b.dose_unit,b.min_number,b.min_unit,b.max_unit,b.drug_name,b.drug_type,b.min_price").Joins("left join xt_base_drug as b on b.id = x.drug_id").Scan(&out).Error
+	return out, err
+}
+
 func GetLastGoodInformationByGoodId(goodid int64, warehouse_info_id int64, orgid int64) (models.WarehouseOutInfo, error) {
 
 	info := models.WarehouseOutInfo{}
@@ -4351,6 +4362,12 @@ func CreateWarehouseOut(out models.WarehouseOut) error {
 	return err
 }
 
+func GetLastGoodWarehouseOut(orgid int64) (models.WarehouseOut, error) {
+	out := models.WarehouseOut{}
+	err := XTReadDB().Where("org_id = ? and status = 1", orgid).Find(&out).Error
+	return out, err
+}
+
 func CreateWarehouseInfo(info models.WarehousingInfo) error {
 
 	err := XTReadDB().Create(&info).Error