耗材参数

controllers/gobal_config_api_controller.go

@@ -99,6 +99,8 @@ func GobalConfigRegistRouters() {
 	beego.Router("/api/drug/getdrugcountlist", &GobalConfigApiController{}, "Get:GetDrugCountList")
 	beego.Router("/api/drug/getsingleorderdetail", &GobalConfigApiController{}, "Get:GetSingleOrderDetail")
 	beego.Router("/api/drug/getautodrugdetial", &GobalConfigApiController{}, "Get:GetAutoDrugDetail")
+	beego.Router("/api/drug/getdrugorderinprint", &GobalConfigApiController{}, "Get:GetDrugOrderInPrint")
+	beego.Router("/api/drug/getdrugoutorderdetailprint", &GobalConfigApiController{}, "Get:GetDrugOutOrderPrint")
 }
 
 //provinces, _ := service.GetDistrictsByUpid(0)21
@@ -1938,18 +1940,18 @@ func (c *GobalConfigApiController) GetDrugOutStockFlow() {
 		endTime = theTime.Unix()
 	}
 	orgId := c.GetAdminUserInfo().CurrentOrgId
-	if stock_type >= 0 && stock_type != 3 {
-		outList, total, err := service.GetDrugStockOutFlow(drug_id, startTime, endTime, page, limit, orgId, stock_type)
 
-		if err != nil {
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
-			return
-		}
-		c.ServeSuccessJSON(map[string]interface{}{
-			"outList": outList,
-			"total":   total,
-		})
+	outList, total, err := service.GetDrugStockOutFlow(drug_id, startTime, endTime, page, limit, orgId, stock_type)
+
+	if err != nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
+		return
 	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"outList": outList,
+		"total":   total,
+	})
+
 }
 
 func (c *GobalConfigApiController) GetBatchOrderDetail() {
@@ -2045,3 +2047,35 @@ func (c *GobalConfigApiController) GetAutoDrugDetail() {
 		"total": total,
 	})
 }
+
+func (c *GobalConfigApiController) GetDrugOrderInPrint() {
+
+	id := c.GetString("id")
+	ids := strings.Split(id, ",")
+	admin := c.GetAdminUserInfo()
+
+	info, _ := service.FindDrugWarehousingByIdOne(ids, admin.CurrentOrgId)
+	manufacturerList, _ := service.GetAllManufacturerList(admin.CurrentOrgId)
+
+	warehousingInfo, _ := service.FindDrugWarehousingInfoByIdOne(ids, admin.CurrentOrgId)
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"info":             info,
+		"warehousing":      warehousingInfo,
+		"manufacturerList": manufacturerList,
+	})
+}
+
+func (c *GobalConfigApiController) GetDrugOutOrderPrint() {
+	id := c.GetString("id")
+	ids := strings.Split(id, ",")
+	admin := c.GetAdminUserInfo()
+	info, _ := service.FindeDrugWarehouseOutOrder(ids, admin.CurrentOrgId)
+	manufacturerList, _ := service.GetAllManufacturerList(admin.CurrentOrgId)
+	warehousing, _ := service.FindeDrugWarehouseOutDetail(ids, admin.CurrentOrgId)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"info":             info,
+		"warehousing":      warehousing,
+		"manufacturerList": manufacturerList,
+	})
+}

controllers/stock_in_api_controller.go

@@ -90,6 +90,7 @@ func StockManagerApiRegistRouters() {
 	beego.Router("/api/good/getorderdetaibyid", &StockManagerApiController{}, "Get:GetOrderDetailById")
 	beego.Router("/api/good/getsingleoutorderdetail", &StockManagerApiController{}, "Get:GetSingleOutOrderDetail")
 	beego.Router("/api/stock/getexportstocklist", &StockManagerApiController{}, "Get:GetExprotStockList")
+	beego.Router("/api/stock/getoutexprotlist", &StockManagerApiController{}, "Get:GetOutExprotList")
 
 }
 
@@ -445,25 +446,25 @@ func (c *StockManagerApiController) GetWarehouseList() {
 	}
 }
 func (c *StockManagerApiController) GetWarehouseInfoList() {
-	id, _ := c.GetInt64("id", 0)
+	//id, _ := c.GetInt64("id", 0)
 
-	if id <= 0 {
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-		return
-	}
+	id := c.GetString("id")
 
-	warehousing, err := service.FindWarehousingById(id)
+	idArray := strings.Split(id, ",")
+	warehousing, err := service.FindWarehousingByIdOne(idArray)
 
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
 	}
 
-	if warehousing.ID <= 0 {
-		return
+	var ids []int64
+
+	for _, item := range warehousing {
+		ids = append(ids, item.ID)
 	}
 
-	warehousingInfo, err := service.FindWarehousingInfoById(id)
+	warehousingInfo, err := service.FindWarehousingInfoByIdOne(ids)
 	if err == nil {
 		c.ServeSuccessJSON(map[string]interface{}{
 			"info":        warehousingInfo,
@@ -3800,11 +3801,15 @@ func (this *StockManagerApiController) GetStockDrugCount() {
 
 func (this *StockManagerApiController) GetOrderDetialByOrderId() {
 
-	id, _ := this.GetInt64("id")
+	//id, _ := this.GetInt64("id")
+	ids := this.GetString("id")
+	idsArray := strings.Split(ids, ",")
 	orgId := this.GetAdminUserInfo().CurrentOrgId
-	list, _ := service.GetOrderDetialByOrderId(id, orgId)
+	order, _ := service.GetWarehouseOutOrder(idsArray, orgId)
+	list, _ := service.GetOrderDetialByOrderIdOne(idsArray, orgId)
 	this.ServeSuccessJSON(map[string]interface{}{
-		"list": list,
+		"order": order,
+		"list":  list,
 	})
 }
 
@@ -3844,14 +3849,14 @@ func (this *StockManagerApiController) GetSingleOutOrderDetail() {
 
 func (this *StockManagerApiController) GetExprotStockList() {
 
-	id, _ := this.GetInt64("id")
 	adminUserInfo := this.GetAdminUserInfo()
 	orgId := adminUserInfo.CurrentOrgId
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	start_time := this.GetString("start_time")
 	end_time := this.GetString("end_time")
-
+	idArray := this.GetString("id")
+	ids := strings.Split(idArray, ",")
 	var startTime int64
 	if len(start_time) > 0 {
 		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
@@ -3872,8 +3877,46 @@ func (this *StockManagerApiController) GetExprotStockList() {
 		endTime = theTime.Unix()
 	}
 
-	list, _ := service.GetExprotStockList(orgId, id, startTime, endTime)
+	list, _ := service.GetExprotStockList(orgId, ids, startTime, endTime)
 	this.ServeSuccessJSON(map[string]interface{}{
 		"list": list,
 	})
 }
+
+func (this *StockManagerApiController) GetOutExprotList() {
+
+	adminUserInfo := this.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	start_time := this.GetString("start_time")
+	end_time := this.GetString("end_time")
+	idArray := this.GetString("id")
+	ids := strings.Split(idArray, ",")
+	fmt.Println("ids2222222222", ids)
+	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()
+	}
+	list, _ := service.GetOutExprotList(orgId, ids, startTime, endTime)
+	outCount, _ := service.GetOutStockTotalCountOne(startTime, endTime, orgId)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list":  list,
+		"count": outCount,
+	})
+}

service/gobal_config_service.go

@@ -582,9 +582,9 @@ func GetDrugStockOutFlow(drugid int64, startime int64, endtime int64, page int64
 		db = db.Where("x.is_sys = 0")
 	}
 	if stocktype == 2 {
-		db = db.Where("x,is_sys = 1")
+		db = db.Where("x.is_sys = 1")
 	}
-	err = db.Select("x.id,x.warehouse_out_id,x.drug_id,x.warehousing_out_target,x.count,x.price,x.total_price,x.product_date,x.expiry_date,x.org_id,x.remark,x.is_cancel,x.warehouse_out_order_number,x.type,x.dealer,x.manufacturer,x.is_sys,x.sys_record_time,x.retail_price,x.retail_total_price,x.warehouse_info_id,x.ctime").Offset(offset).Count(&total).Order("x.ctime desc").Scan(&list).Error
+	err = db.Select("x.id,x.warehouse_out_id,x.drug_id,x.warehousing_out_target,x.count,x.price,x.total_price,x.product_date,x.expiry_date,x.org_id,x.remark,x.is_cancel,x.warehouse_out_order_number,x.type,x.dealer,x.manufacturer,x.is_sys,x.sys_record_time,x.retail_price,x.retail_total_price,x.warehouse_info_id,x.ctime").Count(&total).Offset(offset).Limit(limit).Order("x.ctime desc").Scan(&list).Error
 	return list, total, err
 }
 

service/stock_service.go

@@ -666,7 +666,11 @@ func FindAllDrugWarehousingList(orgId int64, page int64, limit int64, startTime
 func FindWarehousingInfoById(id int64) (list []*models.WarehousingInfo, err error) {
 	err = readDb.Model(&models.WarehousingInfo{}).Where("warehousing_id = ? AND status = 1", id).Preload("GoodInfo").Find(&list).Error
 	return list, err
+}
 
+func FindWarehousingInfoByIdOne(id []int64) (list []*models.WarehousingInfo, err error) {
+	err = readDb.Model(&models.WarehousingInfo{}).Where("warehousing_id in(?) AND status = 1", id).Preload("GoodInfo").Find(&list).Error
+	return list, err
 }
 
 func FindDrugWarehousingInfoById(id int64, org_id int64) (list []*VMDrugWarehouseInfo, err error) {
@@ -674,18 +678,54 @@ func FindDrugWarehousingInfoById(id int64, org_id int64) (list []*VMDrugWarehous
 	return list, err
 }
 
+func FindDrugWarehousingInfoByIdOne(id []string, org_id int64) (list []*models.StDrugWarehouseInfo, err error) {
+
+	db := XTReadDB().Table("xt_drug_warehouse_info as x").Where("x.status = 1")
+	table := XTReadDB().Table("xt_base_drug as t").Where("t.status = 1")
+	fmt.Println(table)
+	if len(id) > 0 {
+		db = db.Where("x.warehousing_id in(?)", id)
+	}
+	if org_id > 0 {
+		db = db.Where("x.org_id = ?", org_id)
+	}
+	err = db.Select("x.id,x.warehousing_id,x.drug_id,x.number,x.product_date,x.expiry_date,x.warehousing_count,x.warehouseing_unit,x.max_unit,x.min_unit,x.stock_max_number,x.stock_min_number,x.price,x.remark,x.batch_number,t.manufacturer,t.dealer,t.drug_name,t.last_price,t.dose_unit,t.dose,t.min_number,t.min_unit,t.max_unit,t.drug_type").Joins("left join xt_base_drug as t on t.id = x.drug_id").Scan(&list).Error
+	return list, err
+}
+
 func FindWarehousingById(id int64) (warehousing models.Warehousing, err error) {
 	err = readDb.Model(&models.Warehousing{}).Where("id = ? AND status = 1 ", id).First(&warehousing).Error
 	return warehousing, err
 
 }
 
+func FindWarehousingByIdOne(id []string) (warehousing []*models.Warehousing, err error) {
+	err = readDb.Model(&models.Warehousing{}).Where("id in(?) and status = 1", id).Find(&warehousing).Error
+	//err = readDb.Model(&models.Warehousing{}).Where("id = ? AND status = 1 ", id).First(&warehousing).Error
+	return warehousing, err
+
+}
+
 func FindDrugWarehousingById(id int64, org_id int64) (warehousing VMDrugWarehouse, err error) {
 	err = readDb.Model(&VMDrugWarehouse{}).Preload("Manufacturers", "status = 1 AND org_id = ?", org_id).Preload("Dealers", "status = 1 AND org_id = ?", org_id).Where("id = ? AND status = 1 ", id).First(&warehousing).Error
 	return warehousing, err
 
 }
 
+func FindDrugWarehousingByIdOne(id []string, org_id int64) (warehousing []*models.DrugWarehouse, err error) {
+
+	db := XTReadDB().Table("xt_drug_warehouse as x").Where("x.status = 1")
+	if len(id) > 0 {
+		db = db.Where("x.id in(?)", id)
+	}
+	if org_id > 0 {
+		db = db.Where("x.org_id = ?", org_id)
+	}
+
+	err = db.Select("x.id,x.warehousing_order,x.operation_time,x.org_id,x.creater,x.ctime,x.modifier,x.warehousing_time").Find(&warehousing).Error
+	return warehousing, err
+}
+
 //func FindDrugWarehousingById(id int64) (warehousing models.DrugWarehouse, err error) {
 //	err = readDb.Model(&models.DrugWarehouse{}).Where("id = ? AND status = 1 ", id).First(&warehousing).Error
 //	return warehousing, err
@@ -2934,6 +2974,34 @@ func GetOrderDetialByOrderId(id int64, orgid int64) (out []*models.WarehouseOutI
 	return out, err
 }
 
+func GetWarehouseOutOrder(id []string, orgid int64) (out []*models.WarehouseOut, err error) {
+
+	db := XTReadDB().Table("xt_warehouse_out as x").Where("x.status = 1")
+	if len(id) > 0 {
+		db = db.Where("x.id in(?)", id)
+	}
+	if orgid > 0 {
+		db = db.Where("x.org_id= ?", orgid)
+	}
+	err = db.Select("x.id,x.warehouse_out_order_number,x.operation_time,x.creater,x.org_id,x.modifier,x.remark,x.warehouse_out_time,x.dealer,x.manufacturer,x.type").Find(&out).Error
+	return out, err
+}
+
+func GetOrderDetialByOrderIdOne(id []string, orgid int64) (out []*models.WarehouseOutInfoOne, err error) {
+
+	db := XTReadDB().Table("xt_warehouse_out_info as x").Where("x.status = 1")
+	table := XTReadDB().Table("xt_good_information as t").Where("t.status = 1")
+	fmt.Println(table)
+	if len(id) > 0 {
+		db = db.Where("x.warehouse_out_id in (?)", id)
+	}
+	if orgid > 0 {
+		db = db.Where("x.org_id = ?", orgid)
+	}
+	err = db.Select("x.id,x.warehouse_out_id,x.good_id,sum(x.count) as count,x.price,x.total_price,x.product_date,x.expiry_date,x.ctime,x.org_id,x.warehouse_out_order_number,x.type,x.dealer,t.manufacturer,x.is_sys,x.sys_record_time,x.number,t.good_name,t.good_type_id,t.specification_name,t.min_number,t.packing_unit,t.min_unit").Joins("left join xt_good_information as t on t.id=x.good_id").Group("x.good_id").Order("x.ctime desc").Scan(&out).Error
+	return out, err
+}
+
 func FindUserDetailByIdOne(good_id int64, record_time int64, org_id int64) (user []*models.AutomaticReduceDetail, err error, total int64) {
 	db := readDb.Model(&models.AutomaticReduceDetail{})
 	db = db.Preload("GoodInfo", "org_id = ? AND status = 1", org_id)
@@ -2952,7 +3020,7 @@ func GetGoodInformationByGoodId(good_id int64) (models.GoodInfo, error) {
 	return info, err
 }
 
-func GetExprotStockList(orgid int64, orderid int64, startime int64, endtime int64) (info []*models.StWarehousingInfo, err error) {
+func GetExprotStockList(orgid int64, orderid []string, startime int64, endtime int64) (info []*models.StWarehousingInfo, err error) {
 
 	db := XTReadDB().Table("xt_warehouse_info as x").Where("x.status = 1")
 
@@ -2962,8 +3030,8 @@ func GetExprotStockList(orgid int64, orderid int64, startime int64, endtime int6
 	if orgid > 0 {
 		db = db.Where("x.org_id = ?", orgid)
 	}
-	if orderid > 0 {
-		db = db.Where("x.warehousing_id = ?", orgid)
+	if len(orderid) > 0 {
+		db = db.Where("x.warehousing_id in(?)", orderid)
 	}
 	if startime > 0 {
 		db = db.Where("x.ctime>=?", startime)
@@ -2994,3 +3062,57 @@ func GetDrugWarehouOrderInfo(startime int64, endtime int64, orgid int64) (info [
 	err = db.Select("x.drug_id,x.count,x.count_unit,t.max_unit,t.min_unit,t.min_number").Joins("left join xt_base_drug as t on t.id = x.drug_id").Scan(&info).Error
 	return info, err
 }
+
+func GetOutExprotList(orgid int64, ids []string, startime int64, endtime int64) (out []*models.WarehouseOutInfoOne, err error) {
+
+	db := XTReadDB().Table("xt_warehouse_out_info as x").Where("x.status =1 ")
+	table := XTReadDB().Table("xt_good_information as t").Where("t.status = 1")
+	fmt.Println(table)
+	if orgid > 0 {
+		db = db.Where("x.org_id = ?", orgid)
+	}
+
+	if len(ids) > 0 {
+		db = db.Where("x.warehouse_out_id in (?)", ids)
+	}
+	if startime > 0 {
+		db = db.Where("x.ctime>=?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("x.ctime<=?", endtime)
+	}
+
+	err = db.Select("x.id,x.warehouse_out_id,x.good_id,x.good_type_id,x.warehousing_out_target,Sum(x.count) as count,x.price,x.total_price,x.product_date,x.expiry_date,x.ctime,x.org_id,x.remark,x.number,t.good_name,t.specification_name,t.min_number,t.packing_price,t.min_unit,t.packing_unit,t.manufacturer,t.dealer").Joins("left join xt_good_information as t on t.id = x.good_id").Group("x.good_id").Scan(&out).Error
+	return out, err
+
+}
+
+func FindeDrugWarehouseOutOrder(ids []string, orgid int64) (info []*models.DrugWarehouseOut, err error) {
+
+	db := XTReadDB().Table("xt_drug_warehouse_out as x").Where("x.status = 1")
+	if len(ids) > 0 {
+		db = db.Where("x.id in(?)", ids)
+	}
+	if orgid > 0 {
+		db = db.Where("x.org_id = ?", orgid)
+	}
+
+	err = db.Select("x.id,x.warehouse_out_order_number,x.operation_time,x.creater,x.org_id,x.modifier,x.remark,x.warehouse_out_time,x.is_sys").Scan(&info).Error
+	return info, err
+
+}
+
+func FindeDrugWarehouseOutDetail(ids []string, orgid int64) (info []*models.VmDrugWarehouseOutInfo, err error) {
+
+	db := XTReadDB().Table("xt_drug_warehouse_out_info as x").Where("x.status =1 ")
+	table := XTReadDB().Table("x.base_drug as t").Where("t.status = 1")
+	fmt.Println(table)
+	if len(ids) > 0 {
+		db = db.Where("x.warehouse_out_id in(?)", ids)
+	}
+	if orgid > 0 {
+		db = db.Where("x.org_id = ?", orgid)
+	}
+	err = db.Select("x.id,x.warehouse_out_id,x.drug_id,x.warehousing_out_target,x.count,x.count_unit,x.price,x.product_date,x.expiry_date,x.number,x.batch_number,t.drug_type,t.max_unit,t.min_unit,t.min_number,t.dose,t.dose_unit,t.last_price,t.drug_name").Joins("left join xt_base_drug as t on t.id =x.drug_id").Scan(&info).Error
+	return info, err
+}