11月8日库存管理

conf/app.conf

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

controllers/base_api_controller.go

@@ -2,7 +2,6 @@ package controllers
 
 import (
 	"XT_New/enums"
-	"XT_New/models"
 	"XT_New/service"
 	"fmt"
 	"strconv"
@@ -70,36 +69,36 @@ type BaseAuthAPIController struct {
 func (this *BaseAuthAPIController) Prepare() {
 	this.BaseAPIController.Prepare()
 	if this.GetAdminUserInfo() == nil {
-		var userAdmin models.AdminUser
-		userAdmin.Id = 1448
-		userAdmin.Mobile = "13318599895"
-
-		userAdmin.Id = 597
-		userAdmin.Mobile = "19874122664"
-		userAdmin.IsSuperAdmin = false
-		userAdmin.Status = 1
-		userAdmin.CreateTime = 1530786071
-		userAdmin.ModifyTime = 1530786071
-		var subscibe models.ServeSubscibe
-		subscibe.ID = 1
-		subscibe.OrgId = 3877
-		subscibe.PeriodStart = 1538035409
-		subscibe.PeriodEnd = 1569571409
-		subscibe.State = 1
-		subscibe.Status = 1
-		subscibe.CreatedTime = 1538035409
-		subscibe.UpdatedTime = 1538035409
-		subscibes := make(map[int64]*models.ServeSubscibe, 0)
-		subscibes[4] = &subscibe
-		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 3877
-		adminUserInfo.CurrentAppId = 4
-		adminUserInfo.AdminUser = &userAdmin
-		adminUserInfo.Subscibes = subscibes
-		this.SetSession("admin_user_info", &adminUserInfo)
-
-		//this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
-		//this.StopRun()
+		//var userAdmin models.AdminUser
+		//userAdmin.Id = 1448
+		//userAdmin.Mobile = "13318599895"
+		//
+		//userAdmin.Id = 597
+		//userAdmin.Mobile = "19874122664"
+		//userAdmin.IsSuperAdmin = false
+		//userAdmin.Status = 1
+		//userAdmin.CreateTime = 1530786071
+		//userAdmin.ModifyTime = 1530786071
+		//var subscibe models.ServeSubscibe
+		//subscibe.ID = 1
+		//subscibe.OrgId = 3877
+		//subscibe.PeriodStart = 1538035409
+		//subscibe.PeriodEnd = 1569571409
+		//subscibe.State = 1
+		//subscibe.Status = 1
+		//subscibe.CreatedTime = 1538035409
+		//subscibe.UpdatedTime = 1538035409
+		//subscibes := make(map[int64]*models.ServeSubscibe, 0)
+		//subscibes[4] = &subscibe
+		//var adminUserInfo service.AdminUserInfo
+		//adminUserInfo.CurrentOrgId = 3877
+		//adminUserInfo.CurrentAppId = 4
+		//adminUserInfo.AdminUser = &userAdmin
+		//adminUserInfo.Subscibes = subscibes
+		//this.SetSession("admin_user_info", &adminUserInfo)
+
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
+		this.StopRun()
 
 	}
 
@@ -316,35 +315,35 @@ type BaseServeAPIController struct {
 func (this *BaseServeAPIController) Prepare() {
 	this.BaseAPIController.Prepare()
 	if this.GetAdminUserInfo() == nil {
-		var userAdmin models.AdminUser
-		userAdmin.Id = 1448
-		userAdmin.Mobile = "13318599895"
-
-		userAdmin.Id = 597
-		userAdmin.Mobile = "19874122664"
-		userAdmin.IsSuperAdmin = false
-		userAdmin.Status = 1
-		userAdmin.CreateTime = 1530786071
-		userAdmin.ModifyTime = 1530786071
-		var subscibe models.ServeSubscibe
-		subscibe.ID = 1
-		subscibe.OrgId = 3877
-		subscibe.PeriodStart = 1538035409
-		subscibe.PeriodEnd = 1569571409
-		subscibe.State = 1
-		subscibe.Status = 1
-		subscibe.CreatedTime = 1538035409
-		subscibe.UpdatedTime = 1538035409
-		subscibes := make(map[int64]*models.ServeSubscibe, 0)
-		subscibes[4] = &subscibe
-		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 3877
-		adminUserInfo.CurrentAppId = 4
-		adminUserInfo.AdminUser = &userAdmin
-		adminUserInfo.Subscibes = subscibes
-		this.SetSession("admin_user_info", &adminUserInfo)
-		//this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
-		//this.StopRun()
+		//var userAdmin models.AdminUser
+		//userAdmin.Id = 1448
+		//userAdmin.Mobile = "13318599895"
+		//
+		//userAdmin.Id = 597
+		//userAdmin.Mobile = "19874122664"
+		//userAdmin.IsSuperAdmin = false
+		//userAdmin.Status = 1
+		//userAdmin.CreateTime = 1530786071
+		//userAdmin.ModifyTime = 1530786071
+		//var subscibe models.ServeSubscibe
+		//subscibe.ID = 1
+		//subscibe.OrgId = 3877
+		//subscibe.PeriodStart = 1538035409
+		//subscibe.PeriodEnd = 1569571409
+		//subscibe.State = 1
+		//subscibe.Status = 1
+		//subscibe.CreatedTime = 1538035409
+		//subscibe.UpdatedTime = 1538035409
+		//subscibes := make(map[int64]*models.ServeSubscibe, 0)
+		//subscibes[4] = &subscibe
+		//var adminUserInfo service.AdminUserInfo
+		//adminUserInfo.CurrentOrgId = 3877
+		//adminUserInfo.CurrentAppId = 4
+		//adminUserInfo.AdminUser = &userAdmin
+		//adminUserInfo.Subscibes = subscibes
+		//this.SetSession("admin_user_info", &adminUserInfo)
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
+		this.StopRun()
 	}
 
 	//if adminUserInfo.AppRole != nil {

controllers/drug_stock_api_contorller.go

@@ -2213,10 +2213,10 @@ func (c *StockDrugApiController) CreateDrugCancelStock() {
 						dealer_id = item.ID
 					}
 				}
-
+				cancelInfo, _ := service.GetLastDrugCancelStockById(adminUserInfo.CurrentOrgId)
 				cancelStockInfo := &models.DrugCancelStockInfo{
-					OrderNumber:      cancelStock.OrderNumber,
-					CancelStockId:    cancelStock.ID,
+					OrderNumber:      cancelInfo.OrderNumber,
+					CancelStockId:    cancelInfo.ID,
 					DrugId:           drug_id,
 					Count:            count,
 					Status:           1,
@@ -2289,10 +2289,8 @@ func (c *StockDrugApiController) CreateDrugCancelStock() {
 		if item.MaxUnit == medical.MinUnit {
 			total_number = item.Count
 		}
-		fmt.Println("当前退库数量", total_number)
 		//查询当前药品退库的批次号的总入库数
 		infoWareInfo, _ := service.GetDrugWarehouseInfo(item.BatchNumberId)
-		fmt.Println("hhh2h3h2hh3233", item.MaxUnit, medical.MaxUnit, infoWareInfo.StockMaxNumber, infoWareInfo.StockMinNumber)
 		var total_count int64
 		total_count = infoWareInfo.StockMaxNumber*medical.MinNumber + infoWareInfo.StockMinNumber
 		fmt.Println("当前批次总库存", total_count)
@@ -2326,8 +2324,7 @@ func (c *StockDrugApiController) CreateDrugCancelStock() {
 		for _, item := range outInfo {
 			out_number += item.Count
 		}
-		fmt.Println("当前退库数量", total_number)
-		fmt.Println("出库数量23232232323222332", out_number)
+
 		if out_number == 0 {
 			service.UpdateDrugCancel(item.CancelStockId)
 			c.ServeSuccessJSON(map[string]interface{}{
@@ -2336,7 +2333,7 @@ func (c *StockDrugApiController) CreateDrugCancelStock() {
 			return
 		}
 		//判断退库数量是否大于总入库数量
-		if total_number > out_number {
+		if total_number > total_count {
 			service.UpdateDrugCancel(item.CancelStockId)
 			c.ServeSuccessJSON(map[string]interface{}{
 				"msg": "2",
@@ -2346,7 +2343,7 @@ func (c *StockDrugApiController) CreateDrugCancelStock() {
 
 		//判断总退库数量是否大于出库数量
 		fmt.Println("该批次总退库数量", can_number+total_number)
-		fmt.Println("总出口数量", out_number)
+		fmt.Println("总出库数量", out_number)
 		if can_number+total_number > out_number {
 			//清空退库单
 			service.UpdateDrugCancel(item.CancelStockId)
@@ -2355,7 +2352,8 @@ func (c *StockDrugApiController) CreateDrugCancelStock() {
 			})
 			return
 		}
-
+		fmt.Println("当前退库数量", total_number)
+		fmt.Println("总出口数量", out_number)
 		//正常退库
 		if total_number <= out_number {
 			//创建退库详情
@@ -2399,15 +2397,6 @@ func (c *StockDrugApiController) CreateDrugCancelStock() {
 					"msg": "1",
 				})
 			}
-			if errs != nil {
-				utils.ErrorLog(errs.Error())
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCancelStockFail)
-				return
-			}
-
-			c.ServeSuccessJSON(map[string]interface{}{
-				"msg": "1",
-			})
 		}
 	}
 }

controllers/stock_in_api_controller.go

@@ -2092,7 +2092,9 @@ func (c *StockManagerApiController) CreateCancelStock() {
 	for _, item := range cancelStockInfos {
 
 		//统计该批次耗材的出库数量
-		info, _ := service.GetWarehoureOrderInfoCount(item.GoodId, item.OrgId, item.WarehouseInfoId)
+		//info, _ := service.GetWarehoureOrderInfoCount(item.GoodId, item.OrgId, item.WarehouseInfoId)
+
+		info, _ := service.GetWarehoureOrderStockOutFlow(item.GoodId, item.OrgId, item.WarehouseInfoId)
 		fmt.Println("2333223323322332233223322323", item.Count, info.Count)
 		if item.Count > info.Count {
 			service.UpdateCancelInfo(item.CancelStockId)
@@ -2489,7 +2491,7 @@ func (c *StockManagerApiController) EditCancelStock() {
 
 		for _, item := range cancelStockInfos {
 			//统计该耗材的出库数量
-			info, _ := service.GetWarehoureOrderInfoCount(item.GoodId, item.OrgId, item.WarehouseInfoId)
+			info, _ := service.GetWarehoureOrderStockOutFlow(item.GoodId, item.OrgId, item.WarehouseInfoId)
 			if item.Count > info.Count {
 				c.ServeSuccessJSON(map[string]interface{}{
 					"msg": "2",

models/drug.go

@@ -65,9 +65,10 @@ type BaseDrugLib struct {
 	HospApprFlag                int64   `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
 	LmtUsedFlag                 int64   `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
 	//MedicineInsurancePercentage []*MedicineInsurancePercentage `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"monitoring_record"`
-	DrugDay               string  `gorm:"column:drug_day" json:"drug_day" form:"drug_day"`
-	Total                 float64 `gorm:"column:total" json:"total" form:"total"`
-	PrescribingNumberUnit string  `gorm:"column:prescribing_number_unit" json:"prescribing_number_unit" form:"prescribing_number_unit"`
+	DrugDay               string                 `gorm:"column:drug_day" json:"drug_day" form:"drug_day"`
+	Total                 float64                `gorm:"column:total" json:"total" form:"total"`
+	PrescribingNumberUnit string                 `gorm:"column:prescribing_number_unit" json:"prescribing_number_unit" form:"prescribing_number_unit"`
+	DrugWarehouseInfo     []*XtDrugWarehouseInfo `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"drug_warehouse_info"`
 }
 
 func (BaseDrugLib) TableName() string {

models/patient_models.go

@@ -1262,7 +1262,7 @@ type XtAssessmentBeforeDislysis struct {
 	DuctusArantiiOther             string  `gorm:"column:ductus_arantii_other" json:"ductus_arantii_other" form:"ductus_arantii_other"`
 	PunctureNeedle                 string  `gorm:"column:puncture_needle" json:"puncture_needle" form:"puncture_needle"`
 	DialysisIntakesUnit            int64   `gorm:"column:dialysis_intakes_unit" json:"dialysis_intakes_unit" form:"dialysis_intakes_unit"`
-	HumorExcessiveSymptom          int64   `gorm:"column:humor_excessive_symptom" json:"humor_excessive_symptom" form:"humor_excessive_symptom"`
+	HumorExcessiveSymptom          string  `gorm:"column:humor_excessive_symptom" json:"humor_excessive_symptom" form:"humor_excessive_symptom"`
 	LastPostDialysisOther          string  `gorm:"column:last_post_dialysis_other" json:"last_post_dialysis_other" form:"last_post_dialysis_other"`
 	SymptomBeforeDialysisOther     string  `gorm:"column:symptom_before_dialysis_other" json:"symptom_before_dialysis_other" form:"symptom_before_dialysis_other"`
 	DialysisInterphaseOther        string  `gorm:"column:dialysis_interphase_other" json:"dialysis_interphase_other" form:"dialysis_interphase_other"`

models/stock_models.go

@@ -550,29 +550,30 @@ func (VmStockFlow) TableName() string {
 }
 
 type CancelStockInfo struct {
-	ID              int64       `gorm:"column:id" json:"id"`
-	GoodId          int64       `gorm:"column:good_id" json:"good_id"`
-	CancelStockId   int64       `gorm:"column:cancel_stock_id" json:"cancel_stock_id"`
-	GoodTypeId      int64       `gorm:"column:good_type_id" json:"good_type_id"`
-	Count           int64       `gorm:"column:count" json:"count"`
-	Price           float64     `gorm:"column:price" json:"price"`
-	Total           float64     `gorm:"column:total" json:"total"`
-	ProductDate     int64       `gorm:"column:product_date" json:"product_date"`
-	ExpiryDate      int64       `gorm:"column:expiry_date" json:"expiry_date"`
-	Ctime           int64       `gorm:"column:ctime" json:"ctime"`
-	Mtime           int64       `gorm:"column:mtime" json:"mtime"`
-	Status          int64       `gorm:"column:status" json:"status"`
-	OrgId           int64       `gorm:"column:org_id" json:"org_id"`
-	OrderNumber     string      `gorm:"column:order_number" json:"order_number"`
-	Type            int64       `gorm:"column:type" json:"type"`
-	CancelStock     CancelStock `ForeignKey:CancelStockId json:"CancelStock"`
-	Dealer          string      `gorm:"column:dealer" json:"dealer"`
-	Manufacturer    string      `gorm:"column:manufacturer" json:"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"`
-	GoodInfo        GoodInfo    `gorm:"ForeignKey:ID;AssociationForeignKey:GoodId" `
+	ID              int64              `gorm:"column:id" json:"id"`
+	GoodId          int64              `gorm:"column:good_id" json:"good_id"`
+	CancelStockId   int64              `gorm:"column:cancel_stock_id" json:"cancel_stock_id"`
+	GoodTypeId      int64              `gorm:"column:good_type_id" json:"good_type_id"`
+	Count           int64              `gorm:"column:count" json:"count"`
+	Price           float64            `gorm:"column:price" json:"price"`
+	Total           float64            `gorm:"column:total" json:"total"`
+	ProductDate     int64              `gorm:"column:product_date" json:"product_date"`
+	ExpiryDate      int64              `gorm:"column:expiry_date" json:"expiry_date"`
+	Ctime           int64              `gorm:"column:ctime" json:"ctime"`
+	Mtime           int64              `gorm:"column:mtime" json:"mtime"`
+	Status          int64              `gorm:"column:status" json:"status"`
+	OrgId           int64              `gorm:"column:org_id" json:"org_id"`
+	OrderNumber     string             `gorm:"column:order_number" json:"order_number"`
+	Type            int64              `gorm:"column:type" json:"type"`
+	CancelStock     CancelStock        `ForeignKey:CancelStockId json:"CancelStock"`
+	Dealer          string             `gorm:"column:dealer" json:"dealer"`
+	Manufacturer    string             `gorm:"column:manufacturer" json:"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"`
+	GoodInfo        GoodInfo           `gorm:"ForeignKey:ID;AssociationForeignKey:GoodId" `
+	WarehousingInfo []*WarehousingInfo `gorm:"ForeignKey:GoodId;AssociationForeignKey:GoodId" json:"xt_warehouse_info"`
 }
 
 func (CancelStockInfo) TableName() string {

service/stock_service.go

@@ -1157,7 +1157,7 @@ func FindReturnInfoById(id int64) (list []*models.SalesReturnInfo, err error) {
 }
 
 func FindCancelStockInfoById(id int64) (list []*models.CancelStockInfo, err error) {
-	err = readDb.Model(&models.CancelStockInfo{}).Where("cancel_stock_id = ? AND status = 1", id).Preload("GoodInfo", "status = 1").Find(&list).Error
+	err = readDb.Model(&models.CancelStockInfo{}).Where("cancel_stock_id = ? AND status = 1", id).Preload("WarehousingInfo", "status = 1").Preload("GoodInfo", "status = 1").Find(&list).Error
 	return list, err
 }
 
@@ -1550,6 +1550,12 @@ func GetLastCancelStockById(orgid int64) (models.CancelStock, error) {
 	return stock, err
 }
 
+func GetLastDrugCancelStockById(orgid int64) (models.DrugCancelStock, error) {
+	stock := models.DrugCancelStock{}
+	err := XTReadDB().Where("org_id = ? and status = 1", orgid).Last(&stock).Error
+	return stock, err
+}
+
 func AddSigleDrugCancelStock(cancelStock *models.DrugCancelStock) error {
 	err := writeDb.Create(&cancelStock).Error
 	return err
@@ -3189,9 +3195,13 @@ func GetSearchDrugList(keywords string, orgid int64) (drug []*models.BaseDrugLib
 	db := XTReadDB().Model(&drug).Where("org_id=? and status=1  and drug_status<>'停用'", orgid)
 	if len(keywords) > 0 {
 		likekey := "%" + keywords + "%"
-		err = db.Where("(drug_name LIKE ?)", likekey).Find(&drug).Error
+		err = db.Where("(drug_name LIKE ?)", likekey).Preload("DrugWarehouseInfo", func(db *gorm.DB) *gorm.DB {
+			return XTReadDB().Where("org_id=? and status = 1 and warehousing_count <> 0", orgid).Group("id")
+		}).Find(&drug).Error
 	} else {
-		err = db.Find(&drug).Error
+		err = db.Preload("DrugWarehouseInfo", func(db *gorm.DB) *gorm.DB {
+			return XTReadDB().Where("org_id=? and status = 1 and warehousing_count <> 0", orgid).Group("id")
+		}).Find(&drug).Error
 	}
 	return
 }
@@ -3205,7 +3215,9 @@ func GetSearchGoodList(keywords string, orgid int64) (good []*models.GoodInfo, e
 			return XTReadDB().Where("org_id=? and status = 1 and warehousing_count <> 0", orgid)
 		}).Find(&good).Error
 	} else {
-		err = db.Find(&good).Error
+		err = db.Preload("StWarehousingInfo", func(db *gorm.DB) *gorm.DB {
+			return XTReadDB().Where("org_id=? and status = 1 and warehousing_count <> 0", orgid)
+		}).Find(&good).Error
 	}
 	return
 }
@@ -3880,6 +3892,21 @@ func GetWarehoureOrderInfoCount(goodid int64, orgid int64, id int64) (info model
 	return info, err
 }
 
+func GetWarehoureOrderStockOutFlow(goodid int64, orgid int64, id int64) (info models.VmStockFlow, err error) {
+	db := XTReadDB().Table("xt_stock_flow as x").Where("x.status =1 and x.consumable_type = 2 or x.consumable_type = 3")
+	if goodid > 0 {
+		db = db.Where("x.good_id = ?", goodid)
+	}
+	if orgid > 0 {
+		db = db.Where("x.user_org_id = ?", orgid)
+	}
+	if id > 0 {
+		db = db.Where("x.warehousing_id = ?", id)
+	}
+	err = db.Select("x.good_id,sum(x.count) as count").Scan(&info).Error
+	return info, err
+}
+
 func UpdateCancelInfo(id int64) (models.CancelStock, error) {
 	stock := models.CancelStock{}
 	err := XTWriteDB().Model(&stock).Where("id=? and status = 1", id).Updates(map[string]interface{}{"status": 0}).Error