提交代码

controllers/new_stock_api_controller.go

@@ -0,0 +1,150 @@
+package controllers
+
+import (
+	"XT_New/enums"
+	"XT_New/service"
+	"XT_New/utils"
+	"fmt"
+	"github.com/astaxie/beego"
+	"time"
+)
+
+type NewStockApiController struct {
+	BaseAuthAPIController
+}
+
+func NewStockApiRegistRouters() {
+	beego.Router("/api/drug/stock", &NewStockApiController{}, "Get:GetDrugStock")
+	beego.Router("/api/drug/change", &NewStockApiController{}, "Get:GetDrugChange")
+	//beego.Router("/api/drug/query", &NewStockApiController{}, "Get:GetDrugQuery")
+
+}
+
+func (c *NewStockApiController) GetDrugStock() {
+	start_time := c.GetString("start_time")
+	end_time := c.GetString("end_time")
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var startTime int64
+	if len(start_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		if err != nil {
+			fmt.Println(err)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTime = theTime.Unix()
+	}
+	var endTime int64
+	if len(end_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
+
+	admin := c.GetAdminUserInfo()
+	is_pc, _ := c.GetInt64("is_pc", 0)
+	is_bg, _ := c.GetInt64("is_bg", 0)
+	//manufacturerList, _ := service.GetAllManufacturerList(admin.CurrentOrgId)
+	//dealerList, _ := service.GetAllDealerList(admin.CurrentOrgId)
+	fmt.Println(startTime)
+	fmt.Println(endTime)
+
+	warehousingInfo, err := service.FindAllDrugWarehousingInfo(admin.CurrentOrgId, is_pc, is_bg, startTime, endTime)
+	//list, _ := service.GetAll/**/StoreHouseListThree(admin.CurrentOrgId)
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"info": warehousingInfo,
+			//"manufacturerList": manufacturerList,
+			//"dealerList":       dealerList,
+			//"list": list,
+		})
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+	}
+}
+
+func (c *NewStockApiController) GetDrugChange() {
+	start_time := c.GetString("start_time")
+	end_time := c.GetString("end_time")
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var startTime int64
+	if len(start_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		if err != nil {
+			fmt.Println(err)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTime = theTime.Unix()
+	}
+	var endTime int64
+	if len(end_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
+	orgId := c.GetAdminUserInfo().CurrentOrgId
+	page, _ := c.GetInt64("page")
+	limit, _ := c.GetInt64("limit")
+	list, total, _ := service.GetNewDrugFlow(orgId, limit, page, startTime, endTime)
+	manufacturerList, _ := service.GetAllManufacturerList(orgId)
+	dealerList, _ := service.GetAllDealerList(orgId)
+	houseList, _ := service.GetAllStoreHouseList(orgId)
+	//patientList, _ := service.GetAllPatientListSix(orgId)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"info":             list,
+		"total":            total,
+		"manufacturerList": manufacturerList,
+		"dealerList":       dealerList,
+		"houseList":        houseList,
+		//"patientList":      patientList,
+	})
+}
+func (c *NewStockApiController) GetDrugQuery() {
+	id, _ := c.GetInt64("id", 0)
+
+	if id <= 0 {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	admin := c.GetAdminUserInfo()
+
+	warehousing, err := service.FindDrugWarehousingById(id, admin.CurrentOrgId)
+
+	manufacturerList, _ := service.GetAllManufacturerList(admin.CurrentOrgId)
+	dealerList, _ := service.GetAllDealerList(admin.CurrentOrgId)
+	if err != nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+
+	if warehousing.ID <= 0 {
+		return
+	}
+
+	warehousingInfo, err := service.FindDrugWarehousingInfoByIdThree(id, admin.CurrentOrgId)
+	list, _ := service.GetAllStoreHouseListThree(admin.CurrentOrgId)
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"info":             warehousingInfo,
+			"warehousing":      warehousing,
+			"manufacturerList": manufacturerList,
+			"dealerList":       dealerList,
+			"list":             list,
+		})
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+	}
+}

models/drug_stock.go

@@ -461,6 +461,10 @@ type DrugFlow struct {
 	FlushOverCount            int64                  `gorm:"column:flush_over_count" json:"flush_over_count" form:"flush_over_count"`
 	Remark                    string                 `gorm:"column:remark" json:"remark" form:"remark"`
 	OperateTime               int64                  `gorm:"column:operate_time" json:"operate_time" form:"operate_time"`
+	SaleDate                  string                 `gorm:"column:sale_date" json:"sale_date" form:"sale_date"`
+	PCount                    float64
+	SDate                     string
+	PDate                     int64
 }
 
 func (DrugFlow) TableName() string {

models/new_drug_stock.go

@@ -0,0 +1,70 @@
+package models
+
+type NewDrugFlow struct {
+	ID                        int64                  `gorm:"column:id" json:"id" form:"id"`
+	WarehousingId             int64                  `gorm:"column:warehousing_id" json:"warehousing_id" form:"warehousing_id"`
+	DrugId                    int64                  `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	Number                    string                 `gorm:"column:number" json:"number" form:"number"`
+	BatchNumber               string                 `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	Count                     int64                  `gorm:"column:count" json:"count" form:"count"`
+	UserOrgId                 int64                  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PatientId                 int64                  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	SystemTime                int64                  `gorm:"column:system_time" json:"system_time" form:"system_time"`
+	ConsumableType            int64                  `gorm:"column:consumable_type" json:"consumable_type" form:"consumable_type"`
+	IsSys                     int64                  `gorm:"column:is_sys" json:"is_sys" form:"is_sys"`
+	WarehousingOrder          string                 `gorm:"column:warehousing_order" json:"warehousing_order" form:"warehousing_order"`
+	WarehouseOutId            int64                  `gorm:"column:warehouse_out_id" json:"warehouse_out_id" form:"warehouse_out_id"`
+	WarehouseOutOrderNumber   string                 `gorm:"column:warehouse_out_order_number" json:"warehouse_out_order_number" form:"warehouse_out_order_number"`
+	IsEdit                    int64                  `gorm:"column:is_edit" json:"is_edit" form:"is_edit"`
+	CancelStockId             int64                  `gorm:"column:cancel_stock_id" json:"cancel_stock_id" form:"cancel_stock_id"`
+	CancelOrderNumber         string                 `gorm:"column:cancel_order_number" json:"cancel_order_number" form:"cancel_order_number"`
+	Manufacturer              int64                  `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	Dealer                    int64                  `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Creator                   int64                  `gorm:"column:creator" json:"creator" form:"creator"`
+	UpdateCreator             int64                  `gorm:"column:update_creator" json:"update_creator" form:"update_creator"`
+	Status                    int64                  `gorm:"column:status" json:"status" form:"status"`
+	Ctime                     int64                  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                     int64                  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Price                     float64                `gorm:"column:price" json:"price" form:"price"`
+	WarehousingDetailId       int64                  `gorm:"column:warehousing_detail_id" json:"warehousing_detail_id" form:"warehousing_detail_id"`
+	WarehouseOutDetailId      int64                  `gorm:"column:warehouse_out_detail_id" json:"warehouse_out_detail_id" form:"warehouse_out_detail_id"`
+	CancelOutDetailId         int64                  `gorm:"column:cancel_out_detail_id" json:"cancel_out_detail_id" form:"cancel_out_detail_id"`
+	ExpireDate                int64                  `gorm:"column:expire_date" json:"expire_date" form:"expire_date"`
+	ProductDate               int64                  `gorm:"column:product_date" json:"product_date" form:"product_date"`
+	MaxUnit                   string                 `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
+	MinUnit                   string                 `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	StockMaxNumber            int64                  `gorm:"column:stock_max_number" json:"stock_max_number" form:"stock_max_number"`
+	StockMinNumber            int64                  `gorm:"column:stock_min_number" json:"stock_min_number" form:"stock_min_number"`
+	LastStockMaxNumber        int64                  `gorm:"column:last_stock_max_number" json:"last_stock_max_number" form:"last_stock_max_number"`
+	LastStockMinNumber        int64                  `gorm:"column:last_stock_min_number" json:"last_stock_min_number" form:"last_stock_min_number"`
+	DrugWarehouseInfo         []*DrugWarehouseInfo   `gorm:"ForeignKey:DrugId;AssociationForeignKey:DrugId" `
+	BaseDrugLib               BaseDrugLib            `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId" `
+	AdviceId                  int64                  `gorm:"column:advice_id" json:"advice_id" form:"advice_id"`
+	SupplyWarehouseId         int64                  `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
+	SupplyCancelOutId         int64                  `gorm:"column:supply_cancel_out_id" json:"supply_cancel_out_id" form:"supply_cancel_out_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"`
+	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"`
+	LastPrice                 float64                `gorm:"column:last_price" json:"last_price" form:"last_price"`
+	StockCount                string                 `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
+	PharmacyId                int64                  `gorm:"column:pharmacy_id" json:"pharmacy_id" form:"pharmacy_id"`
+	DrugWarehouseInfoOne      DrugWarehouseInfo      `gorm:"ForeignKey:ID;AssociationForeignKey:WarehousingDetailId"json:"xt_drug_warehouse_info" `
+	IsRead                    int64                  `gorm:"column:is_read" json:"is_read" form:"is_read"`
+	IsCheck                   int64                  `gorm:"column:is_check" json:"is_check" form:"is_check"`
+	OverCount                 int64                  `gorm:"column:over_count" json:"over_count" form:"over_count"`
+	RetailPrice               float64                `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	XtDrugWarehouseOutInfo    XtDrugWarehouseOutInfo `gorm:"ForeignKey:ID;AssociationForeignKey:WarehouseOutDetailId"json:"xt_drug_warehouse_out_info" `
+	OrderId                   int64                  `gorm:"column:order_id" json:"order_id" form:"order_id"`
+	FlushOverCount            int64                  `gorm:"column:flush_over_count" json:"flush_over_count" form:"flush_over_count"`
+	Remark                    string                 `gorm:"column:remark" json:"remark" form:"remark"`
+	OperateTime               int64                  `gorm:"column:operate_time" json:"operate_time" form:"operate_time"`
+	SaleDate                  string                 `gorm:"column:sale_date" json:"sale_date" form:"sale_date"`
+	PCount                    float64
+	SDate                     string
+	PDate                     int64
+}
+
+func (NewDrugFlow) TableName() string {
+	return "xt_drug_flow"
+}

models/new_stock.go

@@ -0,0 +1,38 @@
+package models
+
+type DrugWarehouseInfoTenOne struct {
+	ID               int64   `gorm:"column:id" json:"id" form:"id"`
+	WarehousingId    int64   `gorm:"column:warehousing_id" json:"warehousing_id" form:"warehousing_id"`
+	DrugId           int64   `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	Number           string  `gorm:"column:number" json:"number" form:"number"`
+	ProductDate      int64   `gorm:"column:product_date" json:"product_date" form:"product_date"`
+	ExpiryDate       int64   `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
+	WarehousingCount int64   `gorm:"column:warehousing_count" json:"warehousing_count" form:"warehousing_count"`
+	Price            float64 `gorm:"column:price" json:"price" form:"price"`
+	TotalPrice       float64 `gorm:"column:total_price" json:"total_price" form:"total_price"`
+	Dealer           int64   `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Manufacturer     int64   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	Remark           string  `gorm:"column:remark" json:"remark" form:"remark"`
+	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"`
+	IsReturn         int64   `gorm:"column:is_return" json:"is_return" form:"is_return"`
+	WarehousingOrder string  `gorm:"column:warehousing_order" json:"warehousing_order" form:"warehousing_order"`
+	Type             int64   `gorm:"column:type" json:"type" form:"type"`
+	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"`
+	BatchNumber      string  `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	MaxUnit          string  `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
+	MinUnit          string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	//Base                      Drug    `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"drug"`
+	BaseDrugLib               BaseDrugLib `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID"json:"drug" `
+	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"`
+	PcDate                    int64       `gorm:"column:pc_date" json:"pc_date" form:"pc_date"`
+}
+
+func (DrugWarehouseInfoTenOne) TableName() string {
+	return "xt_drug_warehouse_info"
+}

routers/router.go

@@ -87,4 +87,5 @@ func init() {
 	controllers.SignApiRegistRouters()
 	controllers.ZuobiaoApiRegistRouters()
 	controllers.HisExportDataApiRegistRouters()
+	//controllers.NewStockApiRegistRouters()
 }

service/new_stock_medical_insurance_service.go

@@ -0,0 +1,50 @@
+package service
+
+import "XT_New/models"
+
+func FindAllDrugWarehousingInfo(org_id int64, is_pc int64, is_bg int64, start_time int64, end_time int64) (list []*models.DrugWarehouseInfoTenOne, err error) {
+	db := readDb.Model(&models.DrugWarehouseInfoTenOne{}).Preload("BaseDrugLib", "org_id = ?", org_id)
+	if is_pc != 0 {
+		db = db.Where("is_pc = ?", is_pc)
+	}
+	if is_bg != 0 {
+		db = db.Where("is_bg = ?", is_bg)
+	}
+	if start_time != 0 {
+		db = db.Where("ctime >= ?", start_time)
+
+	}
+	if end_time != 0 {
+		db = db.Where("ctime <= ?", end_time)
+
+	}
+
+	err = db.Where("status = 1 and org_id = ?", org_id).Find(&list).Error
+	return list, err
+}
+
+func GetNewDrugFlow(orgid int64, limit int64, page int64, startTime int64, endTime int64) (drug_flow []*models.NewDrugFlow, total int64, err error) {
+
+	offset := (page - 1) * limit
+	db := XTReadDB().Model(drug_flow).Where("status = 1")
+	if orgid > 0 {
+		db = db.Where("user_org_id = ?", orgid)
+	}
+	if startTime > 0 {
+		db = db.Where("ctime >=? ", startTime)
+	}
+	if endTime > 0 {
+		db = db.Where("ctime<=?", endTime)
+	}
+	//if stock_type > 0 {
+
+	//手动入库
+	//if stock_type == 1 {
+	db = db.Where("consumable_type <> 1")
+	//}
+
+	//}
+	err = db.Count(&total).Offset(offset).Limit(limit).Order("id desc").Preload("BaseDrugLib", "status = 1").Preload("DrugWarehouseInfo", "status = 1").Preload("XtDrugWarehouseOutInfo", "status = 1").Find(&drug_flow).Error
+
+	return drug_flow, total, err
+}