11月9日库存管理

controllers/dialysis_api_controller.go

@@ -4311,12 +4311,18 @@ func (this *DialysisApiController) GetDialysisAdviceTemplateList() {
 
 	//获取医嘱模版
 	templateList, _ := service.GetAllHisAdviceTemplateList(orgId)
+
+	_, config := service.FindXTHisRecordByOrgId(orgId)
+
+	drugList, _ := service.GetAllBaseDrugList(orgId)
 	if err == nil {
 		this.ServeSuccessJSON(map[string]interface{}{
 			"list":         list,
 			"total":        total,
 			"adviceList":   adviceList,
 			"templateList": templateList,
+			"config":       config,
+			"drugList":     drugList,
 		})
 		return
 
@@ -4482,12 +4488,15 @@ func (this *DialysisApiController) GetDialysisAdviceSchedulist() {
 	adviceList, _ := service.GetAllLongAdviceList(orgId)
 	//获取医嘱模版
 	templateList, _ := service.GetAllHisAdviceTemplateList(orgId)
+
+	_, config := service.FindXTHisRecordByOrgId(orgId)
 	if err == nil {
 		this.ServeSuccessJSON(map[string]interface{}{
 			"list":         list,
 			"drug":         drug,
 			"adviceList":   adviceList,
 			"templateList": templateList,
+			"config":       config,
 		})
 		return
 

controllers/gobal_config_api_controller.go

@@ -70,9 +70,6 @@ func GobalConfigRegistRouters() {
 	beego.Router("/api/hisstockpriceconfig/get", &GobalConfigApiController{}, "get:GetHisStockPriceConfig")
 	beego.Router("/api/hisstockpriceconfig/isopen", &GobalConfigApiController{}, "post:PostHisStockPriceConfig")
 
-	beego.Router("/api/xtconfig/get", &GobalConfigApiController{}, "get:GetXTHisConfig")
-	beego.Router("/api/xtconfig/isopen", &GobalConfigApiController{}, "post:PostXTHisConfig")
-
 	beego.Router("/api/xtconfigproject/isopen", &GobalConfigApiController{}, "post:PostXTHisProjectConfig")
 
 	beego.Router("/api/isopen/init", &GobalConfigApiController{}, "get:GetAllIsOpenConfig")

controllers/self_drug_api_congtroller.go

@@ -112,6 +112,8 @@ func SelfDrugRouters() {
 	beego.Router("/api/stock/getpurchasenewdrugquery", &SelfDrugApiController{}, "Get:GetPurchaseNewDrugQuery")
 	beego.Router("/api/stock/getgoodovercount", &SelfDrugApiController{}, "Get:GetGoodOverCount")
 	beego.Router("/api/stock/getdrugovercount", &SelfDrugApiController{}, "Get:GetDrugOverCount")
+
+	beego.Router("/api/stock/getdruginfolist", &SelfDrugApiController{}, "Get:GetDrugInventoryWarehouseInfoList")
 }
 
 func (this *SelfDrugApiController) GetCurrentPatient() {
@@ -3992,3 +3994,17 @@ func (this *SelfDrugApiController) GetDrugOverCount() {
 	this.ServeSuccessJSON(returnData)
 	return
 }
+
+func (this *SelfDrugApiController) GetDrugInventoryWarehouseInfoList() {
+
+	storehouse_id, _ := this.GetInt64("storehouse_id")
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	list, _ := service.GetDrugInventoryWarehouseInfoList(orgId, storehouse_id)
+	manufacturerList, _ := service.GetAllManufacturerList(orgId)
+	dealerList, _ := service.GetAllDealerList(orgId)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list":             list,
+		"manufacturerList": manufacturerList,
+		"dealerList":       dealerList,
+	})
+}

controllers/stock_in_api_controller.go

@@ -147,6 +147,8 @@ func StockManagerApiRegistRouters() {
 	beego.Router("/api/stock/checkstockwarehouseinfo", &StockManagerApiController{}, "Get:CheckStockWarehouseInfo")
 	beego.Router("/api/stock/checkreturnstockwarehouseinfo", &StockManagerApiController{}, "Get:CheckReturnStockWarehouseInfo")
 	beego.Router("/api/stock/getprintlist", &StockManagerApiController{}, "Get:GetPrintList")
+
+	beego.Router("/api/stock/getwarehouseinfolist", &StockManagerApiController{}, "Get:GetInvetoryWarehouseInfoList")
 }
 
 func (c *StockManagerApiController) CreateWarehouse() {
@@ -400,7 +402,6 @@ func (c *StockManagerApiController) GetWarehouseList() {
 			}
 		}
 	}
-
 	warehouseList, total, err := service.FindAllWarehousingList(adminUserInfo.CurrentOrgId, page, limit, startTime, endTime, types, keywords, ids, storehouse_id, check_type)
 	houselist, _ := service.GetAllStoreHouseList(adminUserInfo.CurrentOrgId)
 	if err == nil {
@@ -7682,3 +7683,17 @@ func (this *StockManagerApiController) GetPrintList() {
 		"houseList": houseList,
 	})
 }
+
+func (this *StockManagerApiController) GetInvetoryWarehouseInfoList() {
+
+	storehouse_id, _ := this.GetInt64("storehouse_id")
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	list, _ := service.GetInvetoryWarehouseInfoList(orgId, storehouse_id)
+	manufacturerList, _ := service.GetAllManufacturerList(orgId)
+	dealerList, _ := service.GetAllDealerList(orgId)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list":             list,
+		"manufacturerList": manufacturerList,
+		"dealerList":       dealerList,
+	})
+}

service/new_warehouse_service.go

@@ -246,7 +246,7 @@ func ConsumablesGoodDelivery(orgID int64, patient_id int64, record_time int64, g
 				PatientId:               patient_id,
 				SystemTime:              record_time,
 				ConsumableType:          7,
-				IsSys:                   0,
+				IsSys:                   1,
 				WarehousingOrder:        "",
 				WarehouseOutId:          lastOut.WarehouseOutId,
 				WarehouseOutOrderNumber: lastOut.WarehouseOutOrderNumber,
@@ -499,7 +499,7 @@ func ConsumablesGoodDelivery(orgID int64, patient_id int64, record_time int64, g
 				PatientId:               patient_id,
 				SystemTime:              record_time,
 				ConsumableType:          7,
-				IsSys:                   0,
+				IsSys:                   1,
 				WarehousingOrder:        "",
 				WarehouseOutId:          lastOut.WarehouseOutId,
 				WarehouseOutOrderNumber: lastOut.WarehouseOutOrderNumber,
@@ -910,7 +910,7 @@ func BloodDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *
 				PatientId:               advice.PatientId,
 				SystemTime:              advice.AdviceDate,
 				ConsumableType:          7,
-				IsSys:                   0,
+				IsSys:                   1,
 				WarehousingOrder:        "",
 				WarehouseOutId:          0,
 				WarehouseOutOrderNumber: "",
@@ -1205,7 +1205,7 @@ func BloodDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *
 				PatientId:               advice.PatientId,
 				SystemTime:              advice.AdviceDate,
 				ConsumableType:          7,
-				IsSys:                   0,
+				IsSys:                   1,
 				WarehousingOrder:        "",
 				WarehouseOutId:          0,
 				WarehouseOutOrderNumber: "",

service/self_drug_service.go

@@ -2675,3 +2675,9 @@ func ModifyDrugFlowById(id int64, over_count int64) error {
 	err := XTWriteDB().Model(&models.DrugFlow{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"over_count": over_count}).Error
 	return err
 }
+
+func GetDrugInventoryWarehouseInfoList(org_id int64, storehouse_id int64) (info []*models.XtDrugWarehouseInfo, err error) {
+
+	err = XTReadDB().Model(&info).Where("status = 1 and storehouse_id = ? and is_check = 1 and org_id = ?", storehouse_id, org_id).Preload("XtBaseDrug", "status= 1").Find(&info).Error
+	return info, err
+}

service/stock_service.go

@@ -8069,3 +8069,9 @@ func ReduceGoodSumOutCount(storehouse_id int64, good_id int64, user_org_id int64
 	ut.Commit()
 	return err
 }
+
+func GetInvetoryWarehouseInfoList(orgid int64, storehouse_id int64) (info []*models.WarehousingInfo, err error) {
+
+	err = XTReadDB().Model(&info).Where("status = 1 and storehouse_id=? and is_check= 1 and org_id = ?", storehouse_id, orgid).Preload("GoodInfo", "status = 1").Find(&info).Error
+	return info, err
+}