耗材参数

conf/app.conf

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

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -3371,6 +3371,7 @@ func (c *DialysisAPIController) CreateConsumables() {
 			list, _ := service.GetAutoReduceRecordInfoByPatientId(adminUser.Org.Id, patient_id, record_time)
 			fmt.Println("1111111111111111111111111111111111111111111", list)
 			if len(list) == 0 {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 				return
 			}
 
@@ -3629,6 +3630,7 @@ func (c *DialysisAPIController) CreateStockOutInfo() {
 
 				list, _ := service.GetAutoReduceRecordInfoByPatientId(adminInfo.Org.Id, patient_id, record_time)
 				if len(list) == 0 {
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 					return
 				}
 				for _, item := range list {
@@ -3651,13 +3653,12 @@ func (c *DialysisAPIController) CreateStockOutInfo() {
 			//
 		} else if err == nil {
 			for _, item := range consumables {
-
-				fmt.Println("hhhhhhhhhh7777777777777", item.GoodId)
 				//出库
 				service.ConsumablesDelivery(item.UserOrgId, patient_id, record_time, item, &out, item.Count)
 
 				list, _ := service.GetAutoReduceRecordInfoByPatientId(adminInfo.Org.Id, patient_id, record_time)
 				if len(list) == 0 {
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 					return
 				}
 				for _, item := range list {

controllers/stock_in_api_controller.go

@@ -80,6 +80,9 @@ func StockManagerApiRegistRouters() {
 	beego.Router("/api/good/postsearchgoodlist", &StockManagerApiController{}, "Get:PostSearchGoodList")
 
 	beego.Router("/api/good/getallstocklist", &StockManagerApiController{}, "Get:GetAllStockList")
+
+	beego.Router("/api/stock/getstocklistbyid", &StockManagerApiController{}, "Get:GetStockListById")
+	beego.Router("/api/stock/getstockoutlist", &StockManagerApiController{}, "Get:GetStockOutList")
 }
 
 func (c *StockManagerApiController) CreateWarehouse() {
@@ -3652,3 +3655,79 @@ func (this *StockManagerApiController) GetAllStockList() {
 		"manufacturerList": manufacturerList,
 	})
 }
+
+func (this *StockManagerApiController) GetStockListById() {
+
+	id, _ := this.GetInt64("id")
+	adminUserInfo := this.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	limit, _ := this.GetInt64("limit")
+	page, _ := this.GetInt64("page")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	start_time := this.GetString("start_time")
+	end_time := this.GetString("end_time")
+	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 {
+			this.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())
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
+	manufacturerList, _ := service.GetAllManufacturerList(orgId)
+	list, total, _ := service.GetStockListById(id, orgId, limit, page, startTime, endTime)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list":             list,
+		"total":            total,
+		"manufacturerList": manufacturerList,
+	})
+}
+
+func (this *StockManagerApiController) GetStockOutList() {
+
+	id, _ := this.GetInt64("id")
+	adminUserInfo := this.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	limit, _ := this.GetInt64("limit")
+	page, _ := this.GetInt64("page")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	start_time := this.GetString("start_time")
+	end_time := this.GetString("end_time")
+	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 {
+			this.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())
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
+	outList, total, _ := service.GetStockOutList(id, orgId, limit, page, startTime, endTime)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"outList": outList,
+		"total":   total,
+	})
+}

service/stock_service.go

@@ -2761,3 +2761,48 @@ func GetAllStockList(page int64, limit int64, startime int64, endtime int64, goo
 	err = db.Select("x.id,x.warehousing_id,x.good_id,x.good_type_id,x.number,x.product_date,x.expiry_date,x.warehousing_count,x.warehousing_unit,x.stock_count,x.price,x.total_price,x.dealer,x.manufacturer,x.remark,x.ctime,x.is_return,x.warehousing_order,x.type,t.good_name,t.good_type_id,t.specification_name,t.min_number,t.min_unit").Joins("left join xt_good_information as t on t.id = x.good_id").Offset(offset).Count(&total).Group("x.good_id").Scan(&info).Error
 	return info, total, err
 }
+
+func GetStockListById(good_id int64, orgid int64, limit int64, page int64, startime int64, endtime int64) (info []*models.VmWarehousingInfo, total int64, err error) {
+
+	offset := (page - 1) * limit
+	db := XTReadDB().Table("xt_warehouse_info as x").Where("x.status= 1")
+	table := XTReadDB().Table("xt_good_information as t").Where("t.status = 1")
+	fmt.Println(table)
+	if startime > 0 {
+		db = db.Where("x.ctime>=?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("x.ctime<=?", endtime)
+	}
+
+	if orgid > 0 {
+		db = db.Where("x.org_id = ?", orgid)
+	}
+	if good_id > 0 {
+		db = db.Where("x.good_id = ?", good_id)
+	}
+	err = db.Select("x.id,x.warehousing_id,x.good_id,x.good_type_id,x.number,x.product_date,x.expiry_date,x.warehousing_count,x.warehousing_unit,x.stock_count,x.price,x.total_price,x.dealer,x.manufacturer,x.remark,x.ctime,x.is_return,x.warehousing_order,x.type,t.good_name,t.good_type_id,t.specification_name,t.min_number,t.min_unit").Joins("left join xt_good_information as t on t.id = x.good_id").Offset(offset).Count(&total).Scan(&info).Error
+	return info, total, err
+
+}
+
+func GetStockOutList(good_id int64, orgid int64, limit int64, page int64, startime int64, endtime int64) (info []*models.WarehouseOutInfo, total int64, err error) {
+	offset := (page - 1) * limit
+
+	db := XTReadDB().Table("xt_warehouse_out_info as x").Where("x.status= 1")
+	if startime > 0 {
+		db = db.Where("x.ctime>=?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("x.ctime<=?", endtime)
+	}
+
+	if orgid > 0 {
+		db = db.Where("x.org_id = ?", orgid)
+	}
+	if good_id > 0 {
+		db = db.Where("x.good_id = ?", good_id)
+	}
+	err = db.Select("x.id,x.warehouse_out_id,x.warehouse_info_id,x.good_id,x.good_type_id,x.warehousing_out_target,x.count,x.price,x.total_price,x.product_date,x.expiry_date,x.ctime,x.org_id").Offset(offset).Count(&total).Scan(&info).Error
+	return info, total, err
+}