Browse Source

数据录入增加明细

huahaiyan 6 years ago
parent
commit
49e888656d

+ 2 - 2
src/dashoo.cn/backend/api/business/limsbalance/limsbalanceService.go

@@ -273,7 +273,7 @@ func (this *LimsBalanceService) CreateDataentry(AccCode string, UserNames string
 		dataentryentity.CreateBy = ConUserList[i]
 		dataentryentity.CreateUserId, _ = utils.StrTo(ConUserIdList[i]).Int()
 		_, err = svc.InsertEntityBytbl(AccCode+LimsDateEntryName, &dataentryentity)
-		err = this.adddataentrydetail(entrustmaindata.Id, dataentryentity.Id, templatecode, AccCode)
+		err = this.adddataentrydetail(entrustmaindata.Id, dataentryentity.Id, balancedata.Id, templatecode, AccCode)
 		//启动数据录入工作流
 		svcActiviti := workflow.GetActivitiService(utils.DBE)
 		var processInstanceId string
@@ -287,7 +287,7 @@ func (this *LimsBalanceService) CreateDataentry(AccCode string, UserNames string
 	}
 	return err
 }
-func (this *LimsBalanceService) adddataentrydetail(entrustmainId, dataentryid int, templatecode, AccCode string) error {
+func (this *LimsBalanceService) adddataentrydetail(entrustmainId, dataentryid, balanceid int, templatecode, AccCode string) error {
 	var err error
 	svc := limsdataentry.GetLimsDataEntryService(utils.DBE)
 	var entrustenquipment []limsentrustequipment.LimsEntrustEquipment

+ 3 - 3
src/dashoo.cn/backend/api/controllers/lims/limsentrustequipment.go

@@ -50,7 +50,7 @@ func (this *LimsEntrustEquipmentController) GetEntityList() {
 	Spec := this.GetString("Spec")
 	SpecId := this.GetString("SpecId")
 	Manufacturer := this.GetString("Manufacturer")
-	Status := this.GetString("Status")
+	status := this.GetString("Status")
 	Remark := this.GetString("Remark")
 	CreateOn := this.GetString("CreateOn")
 	CreateUserId := this.GetString("CreateUserId")
@@ -139,8 +139,8 @@ func (this *LimsEntrustEquipmentController) GetEntityList() {
 	}
 
 
-	if Status != "" {
-		where = where + " and Status like '%" + Status + "%'"
+	if status != "" {
+		where = where + " and Status like '%" + status + "%'"
 	}