浏览代码

11月8日库存管理

XMLWAN 2 年前
父节点
当前提交
092c49af25

+ 10 - 10
controllers/data_api_controller.go 查看文件

512
 			return
512
 			return
513
 		}
513
 		}
514
 		parent_id := int64(configBody["parent_id"].(float64))
514
 		parent_id := int64(configBody["parent_id"].(float64))
515
-		if parent_id <= 0 {
516
-			utils.ErrorLog("parent_id <= 0")
517
-			code = enums.ErrorCodeParamWrong
518
-			return
519
-		}
515
+		//if parent_id <= 0 {
516
+		//	utils.ErrorLog("parent_id <= 0")
517
+		//	code = enums.ErrorCodeParamWrong
518
+		//	return
519
+		//}
520
 		dataconfig.ParentId = parent_id
520
 		dataconfig.ParentId = parent_id
521
 
521
 
522
 		if configBody["name"] == nil || reflect.TypeOf(configBody["name"]).String() != "string" {
522
 		if configBody["name"] == nil || reflect.TypeOf(configBody["name"]).String() != "string" {
525
 			return
525
 			return
526
 		}
526
 		}
527
 		name, _ := configBody["name"].(string)
527
 		name, _ := configBody["name"].(string)
528
-		if len(name) == 0 {
529
-			utils.ErrorLog("len(name) == 0")
530
-			code = enums.ErrorCodeParamWrong
531
-			return
532
-		}
528
+		//if len(name) == 0 {
529
+		//	utils.ErrorLog("len(name) == 0")
530
+		//	code = enums.ErrorCodeParamWrong
531
+		//	return
532
+		//}
533
 		dataconfig.Name = name
533
 		dataconfig.Name = name
534
 	}
534
 	}
535
 	return
535
 	return

+ 1 - 1
controllers/mobile_api_controllers/check_weight_api_controller.go 查看文件

269
 
269
 
270
 	template, _ := service.GetOrgInfoTemplate(adminUserInfo.Org.Id)
270
 	template, _ := service.GetOrgInfoTemplate(adminUserInfo.Org.Id)
271
 
271
 
272
-	if template.TemplateId == 22 || template.TemplateId == 17 || template.TemplateId == 21 || template.TemplateId == 26 || template.TemplateId == 27 || template.TemplateId == 34 || template.TemplateId == 30 || template.TemplateId == 32 || template.TemplateId == 36 || template.TemplateId == 40 || template.TemplateId == 38 || template.TemplateId == 43 || template.TemplateId == 46 {
272
+	if template.TemplateId == 22 || template.TemplateId == 17 || template.TemplateId == 21 || template.TemplateId == 26 || template.TemplateId == 27 || template.TemplateId == 34 || template.TemplateId == 30 || template.TemplateId == 32 || template.TemplateId == 36 || template.TemplateId == 40 || template.TemplateId == 38 || template.TemplateId == 43 || template.TemplateId == 46 || template.TemplateId == 53 {
273
 		dewater_amount = dewater_amount * 1000
273
 		dewater_amount = dewater_amount * 1000
274
 	}
274
 	}
275
 
275
 

+ 2 - 2
service/print_data_service/schedule_dialysis/print_schedule_dialysis_service.go 查看文件

33
 		return db.Where("user_org_id = ? AND status = 1", orgID).
33
 		return db.Where("user_org_id = ? AND status = 1", orgID).
34
 			Order("operate_time asc")
34
 			Order("operate_time asc")
35
 	}).
35
 	}).
36
-		Preload("DeviceNumber", "org_id = ? AND status = 1", orgID).
37
-		Preload("DeviceZone", "org_id = ? AND status = 1", orgID).
36
+		Preload("DeviceNumber", "org_id = ?", orgID).
37
+		Preload("DeviceZone", "org_id = ?", orgID).
38
 		Preload("DoubleCheck", "user_org_id = ? AND status = 1", orgID).
38
 		Preload("DoubleCheck", "user_org_id = ? AND status = 1", orgID).
39
 		Preload("Summer", "user_org_id = ? AND status = 1", orgID).
39
 		Preload("Summer", "user_org_id = ? AND status = 1", orgID).
40
 		Preload("Advices", func(db *gorm.DB) *gorm.DB {
40
 		Preload("Advices", func(db *gorm.DB) *gorm.DB {