11月8日库存管理

controllers/dialysis_record_api_controller.go

@@ -77,7 +77,7 @@ func (this *DialysisRecordAPIController) GetSchedules() {
 	redis := service.RedisClient()
 	defer redis.Close()
 	key := "scheduals_" + schedualDate + "_" + strconv.FormatInt(orgID, 10)
-
+	patients, _ := service.GetAllPcPatientListByListSeven(orgID)
 	scheduals_json_str, _ := redis.Get(key).Result()
 
 	if len(scheduals_json_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
@@ -89,8 +89,6 @@ func (this *DialysisRecordAPIController) GetSchedules() {
 		} else {
 			if len(scheduals) > 0 {
 
-				patients, _ := service.GetAllPcPatientListByListSeven(orgID)
-
 				dialysisOrders, _ := service.GetAllPcDialysisOrdersByList(orgID, date.Unix())
 
 				prescriptions, _ := service.GetAllPrescriptionsByList(orgID, date.Unix())

controllers/gobal_config_api_controller.go

@@ -112,6 +112,8 @@ func GobalConfigRegistRouters() {
 	beego.Router("/api/drug/getexportoutorderdruglist", &GobalConfigApiController{}, "Get:GetExportOutOrderDrugList")
 	beego.Router("/api/drug/getdrugflow", &GobalConfigApiController{}, "Get:GetDrugFlow")
 	beego.Router("/api/drug/getcancelstockdetail", &GobalConfigApiController{}, "Get:GetCancelStockDetail")
+
+	beego.Router("/api/changestocksetting/isopen", &GobalConfigApiController{}, "Get:ChangeStockSetting")
 }
 
 //provinces, _ := service.GetDistrictsByUpid(0)21
@@ -1557,9 +1559,11 @@ func (c *GobalConfigApiController) GetAllIsOpenConfig() {
 	_, config := service.FindXTHisRecordByOrgId(adminUserInfo.CurrentOrgId)
 	_, project_config := service.FindXTHisProjectByOrgIdOne(adminUserInfo.CurrentOrgId)
 
+	stockSetting, _ := service.FindStockSettingById(adminUserInfo.CurrentOrgId)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"is_open_xt_his":         config.IsOpen,
 		"is_open_xt_his_project": project_config.IsOpen,
+		"is_open_stock":          stockSetting.IsType,
 	})
 
 }
@@ -2331,3 +2335,31 @@ func (c *GobalConfigApiController) GetCancelStockDetail() {
 		"list": list,
 	})
 }
+
+func (c *GobalConfigApiController) ChangeStockSetting() {
+
+	is_type, _ := c.GetInt64("is_type")
+
+	orgId := c.GetAdminUserInfo().CurrentOrgId
+	setting := models.XtStockSetting{
+		IsType:    is_type,
+		UserOrgId: orgId,
+		Status:    1,
+		Ctime:     time.Now().Unix(),
+		Mtime:     0,
+	}
+
+	//查询机该机构是否已经配置
+	_, errcode := service.GetStockSettingIsExsit(orgId)
+	if errcode == gorm.ErrRecordNotFound {
+		service.CreateStockSetting(setting)
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg": 1,
+		})
+	} else if errcode == nil {
+		service.UpdateStockSetting(orgId, setting)
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg": 1,
+		})
+	}
+}

controllers/patient_api_controller.go

@@ -568,6 +568,14 @@ func (c *PatientApiController) EditPatient() {
 	//	//更新病人ID获取新表病人ID
 	err = service.UpdatepatientTwo(&patientsNew, id)
 
+	nowTimeUinx := time.Now()
+	today := nowTimeUinx.Format("2006-01-02")
+
+	redis := service.RedisClient()
+	defer redis.Close()
+	key := "scheduals_" + today + "_" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10)
+	redis.Set(key, "", time.Second*60*60*18)
+
 	if len(record_date) > 0 {
 		var recordTime int64
 		timeLayout := "2006-01-02"

controllers/secondary_order_api_contorller.go

@@ -40,25 +40,6 @@ func SecondaryOrderApiRegistRouters() {
 	beego.Router("/api/secondary/byliinit", &SecondaryOrderApiController{}, "get:Byliinit")                         //初始化旧数据
 	beego.Router("/api/secondary/getcreaterid", &SecondaryOrderApiController{}, "get:GetCreaterId")                 //获取当前登录的人的id
 
-	beego.Router("/api/secondary/getcode", &SecondaryOrderApiController{}, "get:GetStoreCode")                      //获取仓库编码
-	beego.Router("/api/secondary/updatestatus", &SecondaryOrderApiController{}, "get:UpdateStatus")                 //修改仓库状态
-	beego.Router("/api/secondary/deletestorehouse", &SecondaryOrderApiController{}, "get:DeleteStorehouse")         //删除仓库
-	beego.Router("/api/secondary/isstorehousename", &SecondaryOrderApiController{}, "get:IsStorehouseName")         //仓库名称是否重复
-	beego.Router("/api/secondary/isstorehouseaddress", &SecondaryOrderApiController{}, "get:IsStorehouseAddress")   //仓库地址是否重复
-	beego.Router("/api/secondary/storehouselist", &SecondaryOrderApiController{}, "get:StorehouseList")             //分页
-	beego.Router("/api/secondary/addstorehouse", &SecondaryOrderApiController{}, "post:AddStorehouse")              //新增仓库
-	beego.Router("/api/secondary/updatestorehouse", &SecondaryOrderApiController{}, "post:UpdateStorehouse")        //修改
-	beego.Router("/api/secondary/getonestorehouse", &SecondaryOrderApiController{}, "get:GetOneStorehouse")         //查一条仓库的信息
-	beego.Router("/api/secondary/getallstorehousename", &SecondaryOrderApiController{}, "get:GetAllStorehouseName") //获取当前机构的所有可用仓库名称
-	beego.Router("/api/secondary/findstorehouseconfig", &SecondaryOrderApiController{}, "get:FindStorehouseConfig") //查询该机构的仓库配置
-	beego.Router("/api/secondary/updateinfo", &SecondaryOrderApiController{}, "get:UpdateInfo")                     //更改耗材自动入库仓库
-	beego.Router("/api/secondary/updateoutinfo", &SecondaryOrderApiController{}, "get:UpdateOutInfo")               //更改耗材自动出库仓库
-	beego.Router("/api/secondary/updatedruginfo", &SecondaryOrderApiController{}, "get:UpdateDrugInfo")             //更改药品自动入库仓库
-	beego.Router("/api/secondary/updatedrugout", &SecondaryOrderApiController{}, "get:UpdateDrugOut")               //更改药品自动出库仓库
-	beego.Router("/api/secondary/getusername", &SecondaryOrderApiController{}, "get:GetuserName")                   //获取仓库管理员信息
-	beego.Router("/api/secondary/byliinit", &SecondaryOrderApiController{}, "get:Byliinit")                         //初始化旧数据
-	beego.Router("/api/secondary/getcreaterid", &SecondaryOrderApiController{}, "get:GetCreaterId")
-
 	beego.Router("/api/seconde/getsencondegoodlist", &SecondaryOrderApiController{}, "Get:GetSencondeGoodList")
 	beego.Router("/api/senconde/savesencondorder", &SecondaryOrderApiController{}, "Post:SaveSencondOrder")
 	beego.Router("/api/senconde/getallsecondeorderlist", &SecondaryOrderApiController{}, "Get:GetAllSecondeOrderList")
@@ -1538,7 +1519,7 @@ func (this *SecondaryOrderApiController) ReturnCheckSecondOrder() {
 				outList, _ := service.GetStoreWarehouseOutList(item.ProjectId, item.ID, item.UserOrgId)
 				for _, it := range outList {
 					//回退库存
-					service.ModifyStoreWarehouseById(it.WarehouseInfotId, item.Count)
+					service.ModifyStoreWarehouseById(it.WarehouseInfotId, it.Count)
 
 					//获取入库单
 					storeWareing, _ := service.GetStoreWarehouseById(item.WarehouseId, it.OrgId)
@@ -1785,6 +1766,22 @@ func (this *SecondaryOrderApiController) UpdateInfo() {
 	}
 	id, _ := this.GetInt64("id")
 	err = service.UpdateInfo(orgId, id)
+
+	//查询默认仓库
+	houseConfig, _ := service.GetAllStoreHouseConfig(orgId)
+
+	list, _ := service.GetAllGoodList(orgId)
+	for _, item := range list {
+		var sum_count int64
+		var sum_in_count int64
+		goodList, _ := service.GetGoodSumCountByStoreId(houseConfig.StorehouseOutInfo, item.ID, orgId)
+		for _, it := range goodList {
+			sum_count += it.StockCount
+			sum_in_count += it.WarehousingCount
+		}
+		service.UpdateGoodByGoodId(item.ID, sum_count, sum_in_count, orgId)
+	}
+
 	if err != nil {
 		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
 		return
@@ -1809,6 +1806,22 @@ func (this *SecondaryOrderApiController) UpdateOutInfo() {
 	}
 	id, _ := this.GetInt64("id")
 	err = service.UpdateOutInfo(orgId, id)
+
+	//查询默认仓库
+	houseConfig, _ := service.GetAllStoreHouseConfig(orgId)
+
+	list, _ := service.GetAllGoodList(orgId)
+	for _, item := range list {
+		var sum_count int64
+		var sum_in_count int64
+		goodList, _ := service.GetGoodSumCountByStoreId(houseConfig.StorehouseOutInfo, item.ID, orgId)
+		for _, it := range goodList {
+			sum_count += it.StockCount
+			sum_in_count += it.WarehousingCount
+		}
+		service.UpdateGoodByGoodId(item.ID, sum_count, sum_in_count, orgId)
+	}
+
 	if err != nil {
 		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
 		return
@@ -1832,7 +1845,30 @@ func (this *SecondaryOrderApiController) UpdateDrugInfo() {
 		return
 	}
 	id, _ := this.GetInt64("id")
+
 	err = service.UpdateDrugInfo2(orgId, id)
+
+	//查询默认仓库
+	houseConfig, _ := service.GetAllStoreHouseConfig(orgId)
+	baseDrug, _ := service.GetAllBaseDrugList(orgId)
+
+	for _, item := range baseDrug {
+		var sum_drug_count int64
+		var sum_drug_in_count int64
+
+		//查询默认仓库剩余多少库存
+		list, _ := service.GetDrugSumCountByStorehouseId(houseConfig.DrugStorehouseOut, orgId, item.ID)
+		for _, it := range list {
+			if it.MaxUnit == item.MaxUnit {
+				it.StockMaxNumber = it.StockMaxNumber * item.MinNumber
+				it.WarehousingCount = it.WarehousingCount * item.MinNumber
+			}
+			sum_drug_count += it.StockMaxNumber + it.StockMinNumber
+			sum_drug_in_count += it.WarehousingCount
+		}
+		service.UpdateMedicalSumCount(item.ID, sum_drug_count, sum_drug_in_count, orgId)
+	}
+
 	if err != nil {
 		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
 		return
@@ -1857,6 +1893,28 @@ func (this *SecondaryOrderApiController) UpdateDrugOut() {
 	}
 	id, _ := this.GetInt64("id")
 	err = service.UpdateDrugOut(orgId, id)
+
+	//查询默认仓库
+	houseConfig, _ := service.GetAllStoreHouseConfig(orgId)
+	baseDrug, _ := service.GetAllBaseDrugList(orgId)
+
+	for _, item := range baseDrug {
+		var sum_drug_count int64
+		var sum_drug_in_count int64
+
+		//查询默认仓库剩余多少库存
+		list, _ := service.GetDrugSumCountByStorehouseId(houseConfig.DrugStorehouseOut, orgId, item.ID)
+		for _, it := range list {
+			if it.MaxUnit == item.MaxUnit {
+				it.StockMaxNumber = it.StockMaxNumber * item.MinNumber
+				it.WarehousingCount = it.WarehousingCount * item.MinNumber
+			}
+			sum_drug_count += it.StockMaxNumber + it.StockMinNumber
+			sum_drug_in_count += it.WarehousingCount
+		}
+		service.UpdateMedicalSumCount(item.ID, sum_drug_count, sum_drug_in_count, orgId)
+	}
+
 	if err != nil {
 		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
 		return

models/stock_models.go

@@ -1332,3 +1332,16 @@ type BloodHisPrescriptionProject struct {
 func (BloodHisPrescriptionProject) TableName() string {
 	return "his_prescription_project"
 }
+
+type XtStockSetting struct {
+	ID        int64 `gorm:"column:id" json:"id" form:"id"`
+	IsType    int64 `gorm:"column:is_type" json:"is_type" form:"is_type"`
+	UserOrgId int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	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"`
+}
+
+func (XtStockSetting) TableName() string {
+	return "xt_stock_setting"
+}

service/stock_service.go

@@ -6435,3 +6435,36 @@ func GeAllGoodInformation(orgid int64) (good []*models.GoodInfo, err error) {
 	err = XTReadDB().Where("org_id =? and status = 1 and is_user = 1", orgid).Find(&good).Error
 	return good, err
 }
+
+func GetStockSettingIsExsit(orgid int64) (*models.XtStockSetting, error) {
+
+	setting := models.XtStockSetting{}
+	err := XTReadDB().Where("user_org_id = ? and status = 1", orgid).Find(&setting).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &setting, nil
+}
+
+func CreateStockSetting(setting models.XtStockSetting) error {
+
+	err := XTWriteDB().Create(&setting).Error
+
+	return err
+}
+
+func UpdateStockSetting(orgid int64, setting models.XtStockSetting) error {
+
+	err := XTWriteDB().Model(&models.XtStockSetting{}).Where("user_org_id = ? and status = 1", orgid).Update(map[string]interface{}{"is_type": setting.IsType}).Error
+	return err
+}
+
+func FindStockSettingById(orgid int64) (models.XtStockSetting, error) {
+
+	setting := models.XtStockSetting{}
+	err := XTReadDB().Where("user_org_id = ? and status = 1", orgid).Find(&setting).Error
+	return setting, err
+}