2024/6/17

controllers/gobal_config_api_controller.go

@@ -2413,7 +2413,7 @@ func (c *GobalConfigApiController) GetDrugOutOrderPrint() {
 
 	manufacturerList, _ := service.GetAllManufacturerList(admin.CurrentOrgId)
 
-	warehousing, _ := service.GetExportOutOrderDrugListOne(ids)
+	warehousing, _ := service.GetExportOutOrderDrugListOne(ids, admin.CurrentOrgId)
 
 	drug_warhouse_out, _ := service.GetDrugWarehouseOutTenty(ids, admin.CurrentOrgId)
 
@@ -2439,8 +2439,9 @@ func (c *GobalConfigApiController) ExportDrugList() {
 
 	orderId := c.GetString("order_id")
 	ids := strings.Split(orderId, ",")
-	list, _ := service.ExportDrugList(ids)
 	orgId := c.GetAdminUserInfo().CurrentOrgId
+	list, _ := service.ExportDrugList(ids, orgId)
+
 	manufacturerList, _ := service.GetAllManufacturerList(orgId)
 	dealerList, _ := service.GetAllDealerList(orgId)
 	c.ServeSuccessJSON(map[string]interface{}{
@@ -2456,7 +2457,7 @@ func (c *GobalConfigApiController) GetExportOutOrderDrugList() {
 	ids := strings.Split(orderId, ",")
 	orgId := c.GetAdminUserInfo().CurrentOrgId
 
-	list, _ := service.GetExportOutOrderDrugListOne(ids)
+	list, _ := service.GetExportOutOrderDrugListOne(ids, orgId)
 	outInfoList, _ := service.GetDrugOutListFlow(ids, orgId)
 	manufacturerList, _ := service.GetAllManufacturerList(orgId)
 	dealerList, _ := service.GetAllDealerList(orgId)

controllers/stock_in_api_controller.go

@@ -5008,7 +5008,6 @@ func (this *StockManagerApiController) GetOutExprotList() {
 	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)

service/stock_service.go

@@ -4856,6 +4856,12 @@ func GetOutExprotList(orgid int64, ids []string, startime int64, endtime int64)
 	if orgid > 0 {
 		db = db.Where("x.org_id = ?", orgid)
 	}
+	if orgid > 0 {
+		db = db.Where("t.org_id = ?", orgid)
+	}
+	if orgid > 0 {
+		db = db.Where("p.org_id = ?", orgid)
+	}
 
 	if len(ids) > 0 {
 		db = db.Where("x.warehouse_out_id in (?)", ids)
@@ -5309,13 +5315,13 @@ func GetDrugBatchNumber(drug_id int64, orgid int64) (info []*models.DrugWarehous
 	return info, err
 }
 
-func ExportDrugList(warehouse_out_id []string) (out []*models.StDrugWarehouseInfo, err error) {
+func ExportDrugList(warehouse_out_id []string, org_id int64) (out []*models.StDrugWarehouseInfo, err error) {
 
-	db := XTReadDB().Table("xt_drug_warehouse_info as x").Where("x.status =1")
+	db := XTReadDB().Table("xt_drug_warehouse_info as x").Where("x.status =1 AND x.org_id=?", org_id)
 
-	table := XTReadDB().Table("xt_base_drug as b").Where("b.status = 1")
+	table := XTReadDB().Table("xt_base_drug as b").Where("b.status = 1 and b.org_id = ?", org_id)
 
-	tableOne := XTReadDB().Table("xt_drug_warehouse as p")
+	tableOne := XTReadDB().Table("xt_drug_warehouse as p").Where("p.status=1 and p.org_id=?", org_id)
 	fmt.Println("table", table)
 	fmt.Println("tableOne", tableOne)
 	if len(warehouse_out_id) > 0 {
@@ -5337,9 +5343,9 @@ func GetExportOutOrderDrugList(warehouse_out_id []string) (out []*models.StDrugW
 	return out, err
 }
 
-func GetExportOutOrderDrugListOne(warehouse_out_id []string) (out []*models.StDrugWarehouseOutInfo, err error) {
-	db := XTReadDB().Table("xt_drug_flow as x").Where("x.status = 1")
-	table := XTReadDB().Table("xt_base_drug as b").Where("b.status = 1")
+func GetExportOutOrderDrugListOne(warehouse_out_id []string, org_id int64) (out []*models.StDrugWarehouseOutInfo, err error) {
+	db := XTReadDB().Table("xt_drug_flow as x").Where("x.status = 1 and x.user_org_id =?", org_id)
+	table := XTReadDB().Table("xt_base_drug as b").Where("b.status = 1 and b.org_id = ?", org_id)
 	fmt.Println("table", table)
 	if len(warehouse_out_id) > 0 {
 		db = db.Where("x.warehouse_out_id in(?)", warehouse_out_id)