Forráskód Böngészése

feature(盛京):修改成功状态 值 为11 ,允许交接

卢传敏 3 hete
szülő
commit
3f41782bba

+ 3 - 3
src/dashoo.cn/genepoint_srv/business/converseService/converseService.go

@@ -625,7 +625,7 @@ func (this *ConverseService) sampleRKSuccessDBModify(idsStr string, parentId int
 	}
 	updatesql := "UPDATE " + TABLE_APPLY_DETAIL + " SET IsLocked = '" + STATUS_UNLOCK + "', taskstatus = '" + strconv.Itoa(SUCCESS) + "' WHERE barcode IN (" + idsStr + ")" + " AND parentid = '" + strconv.Itoa(parentId) + "'"
 	// 更新样本状态解锁,原盒子id置为0
-	updatesql2 := "UPDATE " + TABLE_SAMPLE + " SET IsLocked = '" + STATUS_UNLOCK + "', IState = '" + RK_PASS + "',SourceBoxId = 0 WHERE barcode IN (" + idsStr + ")"
+	updatesql2 := "UPDATE " + TABLE_SAMPLE + " SET IsLocked = '" + STATUS_UNLOCK + "', IState = '" + RK_PASS + "', ExecutionTime= '" + gconv.String(gtime.Now()) + "',SourceBoxId = 0 WHERE barcode IN (" + idsStr + ")"
 
 	//更新每个样本的孔位信息
 	_, err = this.DBE.Exec(updatesql)
@@ -655,8 +655,8 @@ func (this *ConverseService) sampleCKSuccessDBModify(idsStr string, parentId int
 	}
 	// 基点出库取出待放回, 清空样本位置信息, 但是状态保留为 取出待放回
 	// sql := "UPDATE " + TABLE_SAMPLE + " SET istate = '" + CK_PASS_ONHOLD + "', islocked = '" + STATUS_UNLOCK + "' WHERE barcode IN ('" + strings.Join(onHold, "','") + "')"
-	sql := "UPDATE " + TABLE_SAMPLE + " SET istate = '" + CK_PASS_ONHOLD + "', islocked = '" + STATUS_UNLOCK + "',equipmentid = '0', shelfid = '0',boxid= '0', position = '', positioninfo = '' WHERE barcode IN ('" + strings.Join(onHold, "','") + "')"
-	sql2 := "UPDATE " + TABLE_SAMPLE + " SET istate = '" + CK_PASS_DONE + "', islocked = '" + STATUS_UNLOCK + "', equipmentid = '0', shelfid = '0',boxid= '0', position = '', positioninfo = '' WHERE barcode IN ('" + strings.Join(done, "','") + "')"
+	sql := "UPDATE " + TABLE_SAMPLE + " SET istate = '" + CK_PASS_ONHOLD + "', islocked = '" + STATUS_UNLOCK + "',equipmentid = '0', shelfid = '0',boxid= '0', position = '', positioninfo = '', OutboundTime= '" + gconv.String(gtime.Now()) + "' WHERE barcode IN ('" + strings.Join(onHold, "','") + "')"
+	sql2 := "UPDATE " + TABLE_SAMPLE + " SET istate = '" + CK_PASS_DONE + "', islocked = '" + STATUS_UNLOCK + "', equipmentid = '0', shelfid = '0',boxid= '0', position = '', positioninfo = '', OutboundTime= '" + gconv.String(gtime.Now()) + "' WHERE barcode IN ('" + strings.Join(done, "','") + "')"
 	sql3 := "UPDATE " + TABLE_APPLY_DETAIL + " SET IsLocked = '" + STATUS_UNLOCK + "', taskstatus = '" + strconv.Itoa(SUCCESS) + "' WHERE barcode IN (" + idsStr + ")" + " AND parentid = '" + strconv.Itoa(parentId) + "'"
 	_, err = this.DBE.Exec(sql)
 	_, err = this.DBE.Exec(sql2)