11月8日库存管理

conf/app.conf

@@ -1,6 +1,6 @@
 appname = 血透
-httpport = 9531
-runmode = prod
+httpport = 9529
+runmode = dev
 
 #
 copyrequestbody = true

controllers/drug_stock_api_contorller.go

@@ -587,8 +587,8 @@ func (c *StockDrugApiController) EditDrugWarehouse() {
 						StockMaxNumber:   warehousing_count,
 					}
 					if max_unit == min_unit {
-						warehouseInfo.StockMaxNumber = 0
-						warehouseInfo.StockMinNumber = warehousing_count
+						warehouseInfo.StockMaxNumber = warehousing_count
+						warehouseInfo.StockMinNumber = 0
 						warehouseInfo.MaxUnit = min_unit
 					}
 					warehousingInfo = append(warehousingInfo, warehouseInfo)
@@ -620,8 +620,8 @@ func (c *StockDrugApiController) EditDrugWarehouse() {
 						BatchNumber:      batch_number,
 					}
 					if max_unit == min_unit {
-						warehouseInfo.StockMaxNumber = 0
-						warehouseInfo.StockMinNumber = warehousing_count
+						warehouseInfo.StockMaxNumber = warehousing_count
+						warehouseInfo.StockMinNumber = 0
 						warehouseInfo.MaxUnit = min_unit
 					}
 
@@ -1470,11 +1470,7 @@ func (c *StockDrugApiController) CreateDrugWarehouseOut() {
 			return
 		} else {
 			service.AddSigleDrugWarehouseOut(&warehouseOut)
-			//list, _ := service.GetLastWarehouseOut(adminUserInfo.CurrentOrgId)
-			//for _, item := range drugFlow {
-			//	item.WarehouseOutId = list.ID
-			//}
-			//service.CreateDrugFlow(drugFlow)
+
 			// 出库流程
 			// 1.查询改药品在药品库的规格信息，并将处方里的规格进行换算（尽量将拆零单位转换成包装单位）
 			drup, _ := service.FindBaseDrugLibRecord(item.OrgId, item.DrugId)
@@ -1592,14 +1588,24 @@ func (c *StockDrugApiController) DeleteDrugWarehouseOut() {
 }
 func (this *StockDrugApiController) DeleteDrugWarehouseOutInfo() {
 	id, _ := this.GetInt64("id", 0)
-	fmt.Println(id)
 	if id == 0 {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
+	//查询详情
+	info, _ := service.GetDrugWarehosueOutInfo(id)
+	drug, _ := service.GetBaseDrugMedical(info.DrugId)
 
+	if info.CountUnit == drug.MaxUnit {
+		//回退库存
+		service.ModeifyDrugWarehosueInfo(info.WarehouseInfoId, info.Count)
+	}
+	if info.CountUnit == drug.MinUnit && drug.MaxUnit != drug.MinUnit {
+		service.ModeFyStockMinById(info.WarehouseInfoId, info.Count)
+	}
+	//删除流水
+	service.DeleteDrugWarehouseOutInfoById(info.ID)
 	err := service.UpDateDrugWarehouseOutStatus(id)
-	service.DeleteDrugWarehouseOutInfoById(id)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDeleteFail)
 	} else {
@@ -2695,7 +2701,7 @@ func (this *StockDrugApiController) DeleteDrugCancelStock() {
 			//回退库存
 			service.ModifyDrugWarehouseByInfoId(item.CancelStockId, item.Count)
 		}
-		if item.MaxUnit == medical.MinUnit {
+		if item.MaxUnit == medical.MinUnit && medical.MaxUnit != medical.MinUnit {
 			service.ModifyDrugWarehouseByStockMin(item.CancelStockId, item.Count)
 		}
 	}
@@ -2716,9 +2722,21 @@ func (this *StockDrugApiController) DeleteDrugCancelStockInfo() {
 		return
 	}
 
-	err := service.UpDateDrugCancleStockStatus(id)
+	//查询
+	cancelinfo, _ := service.GetDrugCancelById(id)
 
-	service.UpDateDrugCancelStockById(id)
+	drug, _ := service.GetBaseDrugMedical(cancelinfo.DrugId)
+	if drug.MaxUnit == cancelinfo.MaxUnit {
+		service.ModeFyDrugWareseInfo(cancelinfo.BatchNumberId, cancelinfo.Count)
+	}
+	if drug.MinUnit == cancelinfo.MaxUnit && drug.MaxUnit != drug.MinUnit {
+		service.ModeFyDrugWarehouseMin(cancelinfo.BatchNumberId, cancelinfo.Count)
+	}
+	//扣减库存
+
+	err := service.UpDateDrugCancleStockStatus(id)
+	//删除流水
+	service.UpDateDrugCancelStockById(cancelinfo.ID)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDeleteFail)
 	} else {

controllers/schedule_api_controller.go

@@ -1417,27 +1417,16 @@ func (this *ScheduleApiController) ExportSchedule() {
 			schedule_date := time.Now().Format("2006-01-02")
 			date, _ := utils.ParseTimeStringToTime("2006-01-02", schedule_date)
 			clear_schedule_date := date.Unix() //根据日期去清除，该日期未来的排班数据
-			//	err := service.UpdateScheduleStatus(clear_schedule_date, this.GetAdminUserInfo().CurrentOrgId)
 			if err == nil {
-				//清除该机构的排班
-				//if delete_type == 1 {
-				//  service.ModeScheduleByTimeOne(theTimeStart.Unix(), theTimeEnd.Unix(), this.GetAdminUserInfo().CurrentOrgId)
-				//}
-				//if delete_type == 0 {
-				//  service.ModeScheduleByTime(theTimeStart.Unix(), theTimeEnd.Unix(), this.GetAdminUserInfo().CurrentOrgId)
-				//}
 
 				for _, item := range schedules {
-					// fmt.Println("clear_schedule_date3232232332232332232323",clear_schedule_date)
 					if item.ScheduleDate > clear_schedule_date {
-						//删除当天的以后日期排班
-						// service.DeleteScheduleExist(item.ScheduleDate, item.UserOrgId)
 						//查找当天日期是否存在
 						_, errcode := service.GetTodayScheduleIsExistOne(item.PatientId, item.ScheduleDate, item.UserOrgId)
 						if errcode == gorm.ErrRecordNotFound {
 
 							//清除当天该床位已有的患者
-							service.ModeFyScheduleById(item.ScheduleDate, item.BedId, item.ScheduleType)
+							service.ModeFyScheduleById(item.ScheduleDate, item.BedId, item.ScheduleType, item.UserOrgId)
 							service.CreateSchedule(item)
 						} else if errcode == nil {
 							schedule := models.XtSchedule{

service/gobal_config_service.go

@@ -260,7 +260,9 @@ func GetDrugInOrderDetail(startime int64, endtime int64, orgid int64, orderType
 	db := XTReadDB().Table("xt_drug_warehouse_info as x").Where("x.status = 1")
 	dbOne := XTReadDB().Table("xt_base_drug as t").Where("t.status =1")
 	dbTwo := XTReadDB().Table("xt_drug_warehouse as s").Where("s.status = 1")
-	fmt.Print(dbOne, dbTwo)
+	dbThree := UserReadDB().Table("sgj_user_admin_role as r").Where("r.status = 1")
+
+	fmt.Print(dbOne, dbTwo, dbThree)
 	if startime > 0 {
 		db = db.Where("x.ctime >=?", startime)
 	}
@@ -275,8 +277,8 @@ func GetDrugInOrderDetail(startime int64, endtime int64, orgid int64, orderType
 	}
 
 	if len(keyword) > 0 {
-
-		db = db.Where("x.warehousing_order like ? or t.drug_name like ? or s.creater like ?", likeKey, likeKey, likeKey)
+		db = db.Joins("left join sgj_xt.xt_drug_warehouse as o on o.id = x.warehousing_id  left join sgj_users.sgj_user_admin_role as r on r.admin_user_id = o.creater").Group("s.id")
+		db = db.Where("x.warehousing_order like ? or t.drug_name like ? or r.user_name like ? ", likeKey, likeKey, likeKey)
 
 	}
 
@@ -347,7 +349,8 @@ func GetDrugOutOrder(startime int64, endtime int64, orgid int64, orderType int64
 	}
 
 	if len(keyword) > 0 {
-		db = db.Where("x.warehouse_out_order_number like ? or b.drug_name like ? or t.creater like ?", likeKey, likeKey, likeKey)
+		db = db.Joins("left join sgj_xt.xt_drug_warehouse_out as o on o.id = x.warehouse_out_id  left join sgj_users.sgj_user_admin_role as r on r.admin_user_id = o.creater").Group("x.id")
+		db = db.Where("x.warehouse_out_order_number like ? or b.drug_name like ?  or r.user_name like ?", likeKey, likeKey, likeKey)
 	}
 
 	if manufacturerId > 0 {
@@ -411,7 +414,9 @@ func GetDrugCancelOrder(startime int64, endtime int64, orgid int64, orderType in
 		db = db.Where("x.type = ? ", orderType)
 	}
 	if len(keyword) > 0 {
-		db = db.Where("x.order_number like ? or s.drug_spec like ? or t.creater like ?", likeKey, likeKey, likeKey)
+		db = db.Joins("left join sgj_xt.xt_drug_cancel_stock as o on o.id = x.cancel_stock_id  left join sgj_users.sgj_user_admin_role as r on r.admin_user_id = o.creater").Group("o.id")
+
+		db = db.Where("x.order_number like ? or s.drug_spec like ? or r.user_name like ? or s.drug_name like ?", likeKey, likeKey, likeKey, likeKey)
 	}
 
 	if manufacturerId > 0 {

service/schedule_service.go

@@ -199,10 +199,10 @@ func GetTodayScheduleIsExistOne(patientid int64, schedudate int64, orgid int64)
 	return &scheudle, nil
 }
 
-func ModeFyScheduleById(schedule_date int64, bedid int64, scheduletype int64) error {
+func ModeFyScheduleById(schedule_date int64, bedid int64, scheduletype int64, orgid int64) error {
 
 	schedule := models.XtSchedule{}
-	err := XTWriteDB().Model(&schedule).Where("schedule_date = ? and bed_id =? and schedule_type = ? and status = 1", schedule_date, bedid, scheduletype).Updates(map[string]interface{}{"status": 0}).Error
+	err := XTWriteDB().Model(&schedule).Where("schedule_date = ? and bed_id =? and schedule_type = ? and status = 1 and user_org_id = ?", schedule_date, bedid, scheduletype, orgid).Updates(map[string]interface{}{"status": 0}).Error
 	return err
 }
 

service/stock_service.go

@@ -2323,20 +2323,20 @@ func UpDateWarehouseInfoByStock(info *models.WarehousingInfo) (err error) {
 	return err
 }
 
-//func UpDateWarehouseInfoByStockDelete(id int64,count int64) (err error) {
-//	err = DB.Model(&models.WarehousingInfo{}).Where("id = ?",info.ID).UpdateColumn("stock_count", gorm.Expr("stock_count + ?", count)).Error
-//	return err
-//}
-
 func UpDateDrugWarehouseOutStatus(id int64) (err error) {
 	err = readDb.Model(&models.DrugWarehouseOutInfo{}).Where("id = ? AND status = 1", id).Update(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()}).Error
 	return
 }
 
 func DeleteDrugWarehouseOutInfoById(id int64) (err error) {
-	err = XTWriteDB().Model(&models.DrugFlow{}).Where("warehouse_out_detail_id = ? and satus = 1", id).Updates(map[string]interface{}{"status": 0}).Error
+	err = XTWriteDB().Model(&models.DrugFlow{}).Where("warehouse_out_detail_id = ? and status = 1", id).Updates(map[string]interface{}{"status": 0}).Error
 	return
 }
+func GetDrugWarehosueOutInfo(id int64) (models.DrugWarehouseOutInfo, error) {
+	info := models.DrugWarehouseOutInfo{}
+	err := XTReadDB().Where("id = ? and status = 1", id).Find(&info).Error
+	return info, err
+}
 
 func EditWarehouseOut(warehouseOut models.WarehouseOut) {
 	err = readDb.Model(&models.WarehouseOut{}).Where("id = ? AND status = 1", warehouseOut.ID).Update(map[string]interface{}{"mtime": time.Now().Unix(), "warehouse_out_time": warehouseOut.WarehouseOutTime, "dealer": warehouseOut.Dealer, "manufacturer": warehouseOut.Manufacturer}).Error
@@ -5674,3 +5674,34 @@ func ModifyDrugWarehouse(id int64, stock_max_number int64, stock_min_number int6
 	err = XTWriteDB().Model(&info).Where("id = ?", id).UpdateColumn("stock_min_number", gorm.Expr("stock_min_number + ?", stock_min_number)).Error
 	return info, err
 }
+
+func ModeifyDrugWarehosueInfo(id int64, stock_max_number int64) error {
+
+	err := XTWriteDB().Model(models.DrugWarehouseInfo{}).Where("id = ?", id).UpdateColumn("stock_max_number", gorm.Expr("stock_max_number + ?", stock_max_number)).Error
+	return err
+}
+
+func ModeFyStockMinById(id int64, stock_min_number int64) error {
+	info := models.DrugWarehouseInfo{}
+	err = XTWriteDB().Model(&info).Where("id = ?", id).UpdateColumn("stock_min_number", gorm.Expr("stock_min_number + ?", stock_min_number)).Error
+	return err
+}
+
+func GetDrugCancelById(id int64) (models.DrugCancelStockInfo, error) {
+
+	info := models.DrugCancelStockInfo{}
+	err := XTReadDB().Where("id = ? and status = 1", id).Find(&info).Error
+	return info, err
+}
+
+func ModeFyDrugWareseInfo(id int64, stock_max_number int64) error {
+	info := models.DrugWarehouseInfo{}
+	err = XTWriteDB().Model(&info).Where("id = ?", id).UpdateColumn("stock_max_number", gorm.Expr("stock_max_number - ?", stock_max_number)).Error
+	return err
+}
+
+func ModeFyDrugWarehouseMin(id int64, stock_min_number int64) error {
+	info := models.DrugWarehouseInfo{}
+	err = XTWriteDB().Model(&info).Where("id = ?", id).UpdateColumn("stock_min_number", gorm.Expr("stock_min_number - ?", stock_min_number)).Error
+	return err
+}

service/warhouse_service.go

@@ -806,7 +806,7 @@ func AutoDrugDeliverInfo(orgID int64, prescribingNumber int64, warehouseout *mod
 			WarehouseOutId:          warehouseout.ID,
 			Status:                  1,
 			Ctime:                   time.Now().Unix(),
-			Remark:                  warehouse.Remark,
+			Remark:                  advice.Remark,
 			OrgId:                   orgID,
 			Type:                    1,
 			Manufacturer:            advice.Manufacturer,
@@ -903,7 +903,7 @@ func AutoDrugDeliverInfo(orgID int64, prescribingNumber int64, warehouseout *mod
 			WarehouseOutId:          warehouseout.ID,
 			Status:                  1,
 			Ctime:                   time.Now().Unix(),
-			Remark:                  warehouse.Remark,
+			Remark:                  advice.Remark,
 			OrgId:                   orgID,
 			Type:                    1,
 			Manufacturer:            advice.Manufacturer,